JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #42716 from xvapx/PR/fix-pythonPackages.cheroot

Browse Source 
pythonPackages.cheroot: fixed tests
This commit is contained in:
Frederik Rietdijk 2018-06-29 09:09:34 +02:00 committed by GitHub
commit d854e3c73c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/python-modules/cheroot/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, fetchPypi, buildPythonPackage { stdenv, fetchPypi, buildPythonPackage
, more-itertools, six , more-itertools, six
, pytest, pytestcov, portend , pytest, pytestcov, portend
, backports_unittest-mock, setuptools_scm }: , backports_unittest-mock
, backports_functools_lru_cache }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "cheroot"; pname = "cheroot";
@ -14,9 +15,16 @@ buildPythonPackage rec {
propagatedBuildInputs = [ more-itertools six ]; 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 = '' checkPhase = ''
py.test cheroot py.test cheroot

3
pkgs/development/python-modules/cherrypy/default.nix
View File

@ -2,6 +2,7 @@
, cheroot, portend, routes, six , cheroot, portend, routes, six
, setuptools_scm , setuptools_scm
, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov
, backports_functools_lru_cache, requests_toolbelt
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -17,7 +18,7 @@ buildPythonPackage rec {
buildInputs = [ setuptools_scm ]; 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 = '' checkPhase = ''
LANG=en_US.UTF-8 pytest LANG=en_US.UTF-8 pytest