diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-12-01 14:45:53 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-12-01 14:45:53 +0100 |
commit | 6231eb49f2e8d660cdbcf250a1290521533acf6b (patch) | |
tree | 73897157774cb72dd5c9f838caae516377b72b03 /pkgs/development/python-modules/aiohttp/default.nix | |
parent | 0aa147911ce1410a82c7c6a332f93c765038df83 (diff) | |
parent | 97506537f46ae06a9c097340942b54018c53e69f (diff) |
Merge staging into staging-next
Diffstat (limited to 'pkgs/development/python-modules/aiohttp/default.nix')
-rw-r--r-- | pkgs/development/python-modules/aiohttp/default.nix | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 90a7b41f7c10..514d1d308e12 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -21,26 +21,36 @@ , brotlipy , freezegun , isPy38 +, re-assert }: buildPythonPackage rec { pname = "aiohttp"; - version = "3.6.3"; + 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 = "698cd7bc3c7d1b82bb728bae835724a486a8c376647aec336aa21a60113c3645"; + 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 [ |