Merge master into staging-next

2023-10-28 12:01:19 +00:00
parent cb64b504a0 b30e97ace2
commit 519b7ea0c3
121 changed files with 1061 additions and 29872 deletions
@@ -18,9 +18,7 @@
 , aiodns
 , brotli
 , faust-cchardet
-, asynctest
 , typing-extensions
-, idna-ssl
 # tests_require
 , async-generator
 , freezegun
@@ -73,11 +71,6 @@ buildPythonPackage rec {
    aiodns
    brotli
    faust-cchardet
-  ] ++ lib.optionals (pythonOlder "3.8") [
-    asynctest
-    typing-extensions
-  ] ++ lib.optionals (pythonOlder "3.7") [
-    idna-ssl
  ];

  # NOTE: pytest-xdist cannot be added because it is flaky. See https://github.com/NixOS/nixpkgs/issues/230597 for more info.