diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/cherrypy/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/cherrypy/default.nix | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix index 778f57e0f9b..f23d0600192 100644 --- a/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix @@ -1,36 +1,27 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k , setuptools_scm , cheroot, portend, more-itertools, zc_lockfile, routes +, jaraco_collections , objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services , fetchpatch }: buildPythonPackage rec { pname = "cherrypy"; - version = "18.3.0"; + version = "18.6.0"; disabled = !isPy3k; src = fetchPypi { pname = "CherryPy"; inherit version; - sha256 = "0q6cs4vrv0rwim4byxfizrlp4h6hmwg3n4baz0ga66vvgiz6hgk8"; + sha256 = "16f410izp2c4qhn4n3l5l3qirmkf43h2amjqms8hkl0shgfqwq2n"; }; - # Remove patches once 88d2163 and 713f672 - # become part of a release - they're currently only present in master. - # ref: https://github.com/cherrypy/cherrypy/pull/1820 - patches = [ - (fetchpatch { - name = "test_HTTP11_Timeout.patch"; - url = "https://github.com/cherrypy/cherrypy/commit/88d21630f68090c56d07000cabb6df4f1b612a71.patch"; - sha256 = "1i6a3qs3ijyd9rgsxb8axigkzdlmr5sl3ljif9rvn0d90211bzwh"; - }) - ]; - propagatedBuildInputs = [ # required cheroot portend more-itertools zc_lockfile + jaraco_collections # optional routes ]; @@ -41,10 +32,13 @@ buildPythonPackage rec { objgraph pytest pytestcov pathpy requests_toolbelt pytest-services ]; + # Keyboard interrupt ends test suite run + # daemonize and autoreload tests have issue with sockets within sandbox # Disable doctest plugin because times out checkPhase = '' substituteInPlace pytest.ini --replace "--doctest-modules" "" pytest \ + -k 'not KeyboardInterrupt and not daemonize and not Autoreload' \ --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \ --deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \ ${stdenv.lib.optionalString stdenv.isDarwin |