diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/cherrypy')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/cherrypy/17.nix | 10 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/cherrypy/default.nix | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix b/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix index daeb6ca45267..d9b9166e0f0d 100644 --- a/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix +++ b/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi , setuptools_scm , cheroot, contextlib2, portend, routes, six, zc_lockfile , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "cherrypy"; - version = "17.4.1"; + version = "17.4.2"; src = fetchPypi { pname = "CherryPy"; inherit version; - sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv"; + sha256 = "ef1619ad161f526745d4f0e4e517753d9d985814f1280e330661333d2ba05cdf"; }; propagatedBuildInputs = [ @@ -25,10 +25,10 @@ buildPythonPackage rec { ]; checkPhase = '' - pytest + pytest ${stdenv.lib.optionalString stdenv.isDarwin "--ignore=cherrypy/test/test_wsgi_unix_socket.py"} ''; - meta = with lib; { + meta = with stdenv.lib; { homepage = https://www.cherrypy.org; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix index a0c8d24889df..75152d39aeb4 100644 --- a/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ stdenv, buildPythonPackage, fetchPypi, isPy3k , setuptools_scm , cheroot, portend, more-itertools, zc_lockfile, routes , objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services @@ -29,11 +29,13 @@ buildPythonPackage rec { objgraph pytest pytestcov pathpy requests_toolbelt pytest-services ]; + # Disable doctest plugin because times out checkPhase = '' - pytest + substituteInPlace pytest.ini --replace "--doctest-modules" "" + pytest --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes ${stdenv.lib.optionalString stdenv.isDarwin "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"} ''; - meta = with lib; { + meta = with stdenv.lib; { homepage = https://www.cherrypy.org; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; |