diff options
author | Linus Heckemann <git@sphalerite.org> | 2019-08-22 15:18:12 +0200 |
---|---|---|
committer | Linus Heckemann <git@sphalerite.org> | 2019-08-22 15:34:49 +0200 |
commit | 2596a81743b30230b514e305151b50d0e383c3e3 (patch) | |
tree | 3adbc4ab083c1134303f199408ff653953b11b46 /pkgs/development/python-modules/cheroot/default.nix | |
parent | 9eec5a385b333cb24ae732161090ff7696393edf (diff) |
cheroot: 6.5.5 -> 6.5.6, fix tests with openssl 1.1
Diffstat (limited to 'pkgs/development/python-modules/cheroot/default.nix')
-rw-r--r-- | pkgs/development/python-modules/cheroot/default.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 96602c624a47..8c55c3ac8bbb 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ stdenv, fetchPypi, buildPythonPackage, pythonAtLeast , more-itertools, six, setuptools_scm, setuptools-scm-git-archive , pytest, pytestcov, portend, pytest-testmon, pytest-mock , backports_unittest-mock, pyopenssl, requests, trustme, requests-unixsocket , backports_functools_lru_cache }: +let inherit (stdenv) lib; in + buildPythonPackage rec { pname = "cheroot"; - version = "6.5.5"; + version = "6.5.6"; src = fetchPypi { inherit pname version; - sha256 = "f6a85e005adb5bc5f3a92b998ff0e48795d4d98a0fbb7edde47a7513d4100601"; + sha256 = "b824f9961eb447809badeb051820a05770354e2f9ae5c355eecc21f22633c217"; }; + patches = [ ./tests.patch ]; + nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; propagatedBuildInputs = [ more-itertools six backports_functools_lru_cache ]; @@ -20,14 +24,17 @@ buildPythonPackage rec { checkInputs = [ pytest pytestcov portend backports_unittest-mock pytest-mock pytest-testmon pyopenssl requests trustme requests-unixsocket ]; # Disable doctest plugin because times out + # Disable xdist (-n arg) because it's incompatible with testmon # Deselect test_bind_addr_unix on darwin because times out # Deselect test_http_over_https_error on darwin because builtin cert fails + # Disable warnings-as-errors because of deprecation warnings from socks on python 3.7 checkPhase = '' - substituteInPlace pytest.ini --replace "--doctest-modules" "" - pytest ${stdenv.lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} + substituteInPlace pytest.ini --replace "--doctest-modules" "" --replace "-n auto" "" + ${lib.optionalString (pythonAtLeast "3.7") "sed -i '/warnings/,+2d' pytest.ini"} + pytest ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "High-performance, pure-Python HTTP"; homepage = https://github.com/cherrypy/cheroot; license = licenses.mit; |