Merge pull request #34528 from dotlambda/aiohttp

pythonPackages.aiohttp: 2.3.9 -> 2.3.10

Changed files
+36 -8
pkgs
development
python-modules
aiohttp
idna-ssl
top-level
+11 -8
pkgs/development/python-modules/aiohttp/default.nix
···
, multidict
, async-timeout
, yarl
+
, idna-ssl
, pytest
, gunicorn
, pytest-raisesregexp
+
, pytest-mock
}:
buildPythonPackage rec {
pname = "aiohttp";
-
version = "2.3.9";
+
version = "2.3.10";
src = fetchPypi {
inherit pname version;
-
sha256 = "6003bed78dc591d31bd89ef16e630a1c4fd97a3cd17b975ec945c0f46d6fc881";
+
sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
};
disabled = pythonOlder "3.4";
-
doCheck = false; # Too many tests fail.
+
checkInputs = [ pytest gunicorn pytest-raisesregexp pytest-mock ];
-
checkInputs = [ pytest gunicorn pytest-raisesregexp ];
-
propagatedBuildInputs = [ async-timeout chardet multidict yarl ];
+
propagatedBuildInputs = [ async-timeout chardet multidict yarl ]
+
++ lib.optional (pythonOlder "3.7") idna-ssl;
-
meta = {
-
description = "Http client/server for asyncio";
-
license = with lib.licenses; [ asl20 ];
+
meta = with lib; {
+
description = "Asynchronous HTTP Client/Server for Python and asyncio";
+
license = licenses.asl20;
homepage = https://github.com/KeepSafe/aiohttp/;
+
maintainers = with maintainers; [ dotlambda ];
};
}
+23
pkgs/development/python-modules/idna-ssl/default.nix
···
+
{ lib, buildPythonPackage, fetchPypi, idna }:
+
+
buildPythonPackage rec {
+
pname = "idna_ssl";
+
version = "1.0.0";
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "1227e44039bd31e02adaeafdbba61281596d623d222643fb021f87f2144ea147";
+
};
+
+
propagatedBuildInputs = [ idna ];
+
+
# Infinite recursion: tests require aiohttp, aiohttp requires idna-ssl
+
doCheck = false;
+
+
meta = with lib; {
+
description = "Patch ssl.match_hostname for Unicode(idna) domains support";
+
homepage = https://github.com/aio-libs/idna-ssl;
+
license = licenses.mit;
+
maintainers = with maintainers; [ dotlambda ];
+
};
+
}
+2
pkgs/top-level/python-packages.nix
···
};
};
+
idna-ssl = callPackage ../development/python-modules/idna-ssl/default.nix { };
+
ijson = callPackage ../development/python-modules/ijson/default.nix {};
imagesize = buildPythonPackage rec {