diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 398f52cefd2..7a7d44339ba 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchPypi, buildPythonPackage , more-itertools, six , pytest, pytestcov, portend -, backports_unittest-mock, setuptools_scm }: +, backports_unittest-mock +, backports_functools_lru_cache }: buildPythonPackage rec { pname = "cheroot"; @@ -14,9 +15,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ more-itertools six ]; - buildInputs = [ setuptools_scm ]; + checkInputs = [ pytest pytestcov portend backports_unittest-mock 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'," "" \ + ''; checkPhase = '' py.test cheroot diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 368111b3651..47aca123998 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -2,6 +2,7 @@ , cheroot, portend, routes, six , setuptools_scm , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov +, backports_functools_lru_cache, requests_toolbelt }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm ]; - checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov ]; + checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt ]; checkPhase = '' LANG=en_US.UTF-8 pytest