diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2019-07-21 04:25:00 -0500 |
---|---|---|
committer | Mario Rodas <marsam@users.noreply.github.com> | 2019-07-21 13:55:45 -0500 |
commit | 9b6ddb3c2bd7c0214f008809c588ed9e5451a6cc (patch) | |
tree | 418e5e6424138e66a631dc03fb0fde81f33ed9c7 /pkgs/development/python-modules/cheroot | |
parent | 2b4495246a7127e1b145207e24a7f5c49834b4ea (diff) | |
download | nixpkgs-9b6ddb3c2bd7c0214f008809c588ed9e5451a6cc.tar nixpkgs-9b6ddb3c2bd7c0214f008809c588ed9e5451a6cc.tar.gz nixpkgs-9b6ddb3c2bd7c0214f008809c588ed9e5451a6cc.tar.bz2 nixpkgs-9b6ddb3c2bd7c0214f008809c588ed9e5451a6cc.tar.lz nixpkgs-9b6ddb3c2bd7c0214f008809c588ed9e5451a6cc.tar.xz nixpkgs-9b6ddb3c2bd7c0214f008809c588ed9e5451a6cc.tar.zst nixpkgs-9b6ddb3c2bd7c0214f008809c588ed9e5451a6cc.zip |
pythonPackages.cheroot: 6.3.3 -> 6.5.5
Diffstat (limited to 'pkgs/development/python-modules/cheroot')
-rw-r--r-- | pkgs/development/python-modules/cheroot/default.nix | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 08a455eb40c..96602c624a4 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,39 +1,30 @@ -{ stdenv, fetchPypi, buildPythonPackage, fetchpatch -, more-itertools, six -, pytest, pytestcov, portend -, backports_unittest-mock +{ stdenv, fetchPypi, buildPythonPackage +, 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 }: buildPythonPackage rec { pname = "cheroot"; - version = "6.3.3"; + version = "6.5.5"; src = fetchPypi { inherit pname version; - sha256 = "8e3ac15e1efffc81425a693e99b3c09d7ea4bf947255d8d4c38e2cf76f3a4d25"; + sha256 = "f6a85e005adb5bc5f3a92b998ff0e48795d4d98a0fbb7edde47a7513d4100601"; }; - patches = fetchpatch { - name = "cheroot-fix-setup-python3.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/cheroot-fix-setup-python3.patch?h=packages/python-cheroot&id=9b33cb0885b3c0d91adeacae23761a4321eb0e64"; - sha256 = "1rlgz0qln536y00mfqlf0i9hz3f53id73wh47cg5q2vcsw1w2bpc"; - }; + nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; propagatedBuildInputs = [ more-itertools six backports_functools_lru_cache ]; - checkInputs = [ pytest pytestcov portend backports_unittest-mock ]; - -# Disable testmon, it needs pytest-testmon, which we do not currently have in nikpkgs, -# and is only used to skip some tests that are already known to work. - postPatch = '' - substituteInPlace "./pytest.ini" --replace "--testmon" "" - substituteInPlace setup.py --replace "use_scm_version=True" "version=\"${version}\"" \ - --replace "'setuptools_scm>=1.15.0'," "" \ - --replace "'setuptools_scm_git_archive>=1.0'," "" \ - ''; + checkInputs = [ pytest pytestcov portend backports_unittest-mock pytest-mock pytest-testmon pyopenssl requests trustme requests-unixsocket ]; + # Disable doctest plugin because times out + # Deselect test_bind_addr_unix on darwin because times out + # Deselect test_http_over_https_error on darwin because builtin cert fails checkPhase = '' - py.test cheroot + 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"} ''; meta = with stdenv.lib; { |