diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-14 13:45:54 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-14 13:45:54 +0200 |
commit | 8d56f2472e47a3f1f388b69c0ecc24421910d555 (patch) | |
tree | 6eabee7471ed3f7395156dc158a58205cca236f4 /pkgs/development/python-modules/zeep/default.nix | |
parent | 9bd78cb0488040ea996b27e82135396a45325af5 (diff) | |
parent | 930659b10bc7c875fd49b1cdae21a631b429c25a (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/python-modules/zeep/default.nix')
-rw-r--r-- | pkgs/development/python-modules/zeep/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index da6bdcde463fc..1aa03983f68a3 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -18,7 +18,7 @@ , freezegun , mock , pretend -, pytest_3 +, pytest , pytestcov , requests-mock , aioresponses @@ -54,12 +54,15 @@ buildPythonPackage rec { mock pretend pytestcov - pytest_3 + pytest requests-mock ] ++ lib.optional isPy3k aioresponses; checkPhase = '' runHook preCheck + # fix compatibility with pytest 4 + substituteInPlace tests/conftest.py \ + --replace 'request.node.get_marker("requests")' 'request.node.get_closest_marker("requests")' # ignored tests requires xmlsec python module HOME=$(mktemp -d) pytest tests --ignore tests/test_wsse_signature.py runHook postCheck |