Unverified Commit 4a5452a1 authored by dotlambda's avatar dotlambda Committed by GitHub
Browse files

python3Packages.granian: 2.5.6 -> 2.6.0 (#469362)

parents ee6adf9e 03e8aabf

pkgs/development/python-modules/granian/default.nix

+9 −3
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ 


buildPythonPackage rec {

  pname = "granian";

  version = "2.5.6";

  version = "2.6.0";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "emmett-framework";

    repo = "granian";

    tag = "v${version}";

    hash = "sha256-XSDBSl7QWqIN5u48z4H5yPHR+ltRmmmrP0JSmvcCcsA=";

    hash = "sha256-Jj75ycr9Y0aCTP5YGzd6um/7emWKqqegUDB7HpTfTcM=";

  };



  # Granian forces a custom allocator for all the things it runs,
@@ -39,7 +39,7 @@ buildPythonPackage rec { 


  cargoDeps = rustPlatform.fetchCargoVendor {

    inherit pname version src;

    hash = "sha256-zQAHJcBWNx5IT/t2wtm7UeOfVNnvfowcp137TePnwiM=";

    hash = "sha256-Q7BWwvkK5rRuhVobxW4qXLo6tnusOaQYN8mBoNVoulw=";

  };



  nativeBuildInputs = with rustPlatform; [
@@ -79,6 +79,12 @@ buildPythonPackage rec { 


  enabledTestPaths = [ "tests/" ];



  disabledTests = [

    # SSLCertVerificationError: certificate verify failed: certificate has expired

    "test_asgi_ws_scope"

    "test_rsgi_ws_scope"

  ];



  pythonImportsCheck = [ "granian" ];



  versionCheckProgramArg = "--version";

pkgs/development/python-modules/granian/no-alloc.patch

+7 −7
Original line number Diff line number Diff line 
diff --git a/Cargo.toml b/Cargo.toml

index cbf1cdb..e819e14 100644

index c7d1647..d5710bd 100644

--- a/Cargo.toml

+++ b/Cargo.toml

@@ -41,7 +41,6 @@ hyper = { version = "=1.6", features = ["http1", "http2", "server"] }

@@ -41,7 +41,6 @@ hyper = { version = "=1.8", features = ["http1", "http2", "server"] }

 hyper-util = { version = "=0.1", features = ["server-auto", "tokio"] }

 itertools = "0.14"

 log = "0.4"

-mimalloc = { version = "0.1.43", default-features = false, features = ["local_dynamic_tls"], optional = true }

-mimalloc = { version = "0.1.43", default-features = false, features = ["local_dynamic_tls", "v3"], optional = true }

 mime_guess = "=2.0"

 pem = "=3.0"

 percent-encoding = "=2.3"

@@ -52,7 +51,6 @@ pyo3-log = "=0.12"

@@ -52,7 +51,6 @@ pyo3-log = { version = "=0.13", git = "https://github.com/gi0baro/pyo3-log.git",

 rustls-pemfile = "2.2"

 socket2 = { version = "=0.6", features = ["all"] }

 sysinfo = "=0.36"

 sysinfo = "=0.37"

-tikv-jemallocator = { version = "0.6.0", default-features = false, features = ["disable_initial_exec_tls"], optional = true }

 tls-listener = { version = "=0.11", features = ["rustls-ring"] }

 tls-listener = { version = "=0.11", git = "https://github.com/gi0baro/tls-listener.git", branch = "0.11.x", features = ["rustls-ring", "rustls-tls12"] }

 tokio = { version = "1.45", features = ["full"] }

 tokio-stream = "0.1"

@@ -62,10 +60,6 @@ tokio-util = { version = "0.7", features = ["codec", "rt"] }

 [build-dependencies]

 pyo3-build-config = "=0.25"

 pyo3-build-config = "=0.27"

 

-[features]

-jemalloc = ["dep:tikv-jemallocator"]