Merge master into staging-next

2024-10-26 00:14:06 +00:00
parent 7f898ed413 9a415c28ae
commit 02bb5e5201
69 changed files with 1634 additions and 1129 deletions
@@ -6,6 +6,7 @@
  fetchFromGitHub,
  substituteAll,
  python,
+  isPy310,

  # build-system
  cython,
@@ -113,6 +114,11 @@ buildPythonPackage rec {
      # don't run benchmarks
      "test_import_time"
    ]
+    # these tests fail with python310 but succeeds with 11+
+    ++ lib.optionals isPy310 [
+      "test_https_proxy_unsupported_tls_in_tls"
+      "test_tcp_connector_raise_connector_ssl_error"
+    ]
    ++ lib.optionals stdenv.hostPlatform.is32bit [ "test_cookiejar" ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572, remove >= v4.0.0