[staging-next] various python fixes (#363255)

NixOS · Dec 8, 2024 · 94b8d29 · 94b8d29
2 parents 38a7813 + 97efe32
commit 94b8d29
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
@@ -27,15 +27,15 @@
 
 buildPythonPackage rec {
   pname = "google-auth";
-  version = "2.35.0";
+  version = "2.36.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     pname = "google_auth";
     inherit version;
-    hash = "sha256-9MZO1OAejotkbvNMAY+L8zON8MjjfYs7ukDn9XSjJ4o=";
+    hash = "sha256-VF6WGPLfC8u33LxFpUZIWxISYkcWl1oepa6BSc52mrE=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -85,6 +85,11 @@ buildPythonPackage rec {
     "google.oauth2"
   ];
 
+  pytestFlagsArray = [
+    # cryptography 44 compat issue
+    "--deselect=tests/transport/test__mtls_helper.py::TestDecryptPrivateKey::test_success"
+  ];
+
   disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
     # Disable tests using pyOpenSSL as it does not build on M1 Macs
     "tests/transport/test__mtls_helper.py"

diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix
@@ -100,6 +100,8 @@ buildPythonPackage rec {
     # httpcore.ConnectError: [Errno -2] Name or service not known
     "test_async_proxy_close"
     "test_sync_proxy_close"
+    # ResourceWarning: Async generator 'httpx._content.ByteStream.__aiter__' was garbage collected before it had been exhausted. Surround its use in 'async with aclosing(...):' to ensure that it gets cleaned up as soon as you're done using it.
+    "test_write_timeout" # trio variant
   ];
 
   disabledTestPaths = [ "tests/test_main.py" ];

diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchPypi,
+  pythonAtLeast,
   pythonOlder,
 
   # Build dependencies
@@ -42,13 +43,13 @@
 
 buildPythonPackage rec {
   pname = "ipython";
-  version = "8.29.0";
+  version = "8.30.0";
   pyproject = true;
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-QLYOFbIlkUUO73PkCgJ893vWUudXUj7rxb18fEmCkOs=";
+    hash = "sha256-ywpAWjBtKZWly7mQGJTSQHhKnzQTlMa6P0/oxuuJ/24=";
   };
 
   build-system = [ setuptools ];
@@ -102,6 +103,11 @@ buildPythonPackage rec {
       # UnboundLocalError: local variable 'child' referenced before assignment
       "test_system_interrupt"
     ]
+    ++ lib.optionals (pythonAtLeast "3.13") [
+      # AttributeError: 'Pdb' object has no attribute 'curframe'. Did you mean: 'botframe'?
+      "test_run_debug_twice"
+      "test_run_debug_twice_with_breakpoint"
+    ]
     ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
       # FileNotFoundError: [Errno 2] No such file or directory: 'pbpaste'
       "test_clipboard_get"

diff --git a/pkgs/development/python-modules/nbmake/default.nix b/pkgs/development/python-modules/nbmake/default.nix
@@ -50,6 +50,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "nbmake" ];
 
+  # tests are prone to race conditions under high parallelism
+  # https://github.com/treebeardtech/nbmake/issues/129
+  pytestFlagsArray = [ "--maxprocesses=4" ];
+
   nativeCheckInputs = [
     pytest-xdist
     pytestCheckHook