Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 15 insertions, 4 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
index 2e5191909bb3..514d1d308e12 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
@@ -21,26 +21,36 @@
 , brotlipy
 , freezegun
 , isPy38
+, re-assert
 }:
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.6.2";
+  version = "3.7.3";
   # https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09pkw6f1790prnrq0k8cqgnf1qy57ll8lpmc6kld09q7zw4vi6i5";
+    sha256 = "9c1a81af067e72261c9cbe33ea792893e83bc6aa987bfbd6fdc1e5e7b22777c4";
   };
 
   checkInputs = [
     pytestrunner pytestCheckHook gunicorn async_generator pytest_xdist
     pytest-mock pytestcov trustme brotlipy freezegun
+    re-assert
   ];
 
-  propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ]
-    ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ];
+  propagatedBuildInputs = [
+    attrs
+    chardet
+    multidict
+    async-timeout
+    typing-extensions
+    yarl
+  ] ++ lib.optionals (pythonOlder "3.7") [
+    idna-ssl
+  ];
 
   disabledTests = [
     # disable tests which attempt to do loopback connections
@@ -54,6 +64,7 @@ buildPythonPackage rec {
     "proxy_https_bad_response"
     "partially_applied_handler"
     "middleware"
+    "test_mark_formdata_as_processed"
     # no longer compatible with pytest>=6
     "aiohttp_plugin_async_fixture"
   ] ++ lib.optionals stdenv.is32bit [