summary refs log tree commit diff
path: root/pkgs/development/python-modules/entrypoints
diff options
context:
space:
mode:
authorTimo Kaufmann <timokau@zoho.com>2019-01-07 20:09:20 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-02-17 14:40:49 +0100
commitb8a299c9102d28f7bb6890a80e383993ff7db3c5 (patch)
tree1dcd2ba6e5c831fd9abd53beaa065a9734d10b70 /pkgs/development/python-modules/entrypoints
parente751df152bfe39ef8389bc5cd7d30d72e8a24d18 (diff)
downloadnixpkgs-b8a299c9102d28f7bb6890a80e383993ff7db3c5.tar
nixpkgs-b8a299c9102d28f7bb6890a80e383993ff7db3c5.tar.gz
nixpkgs-b8a299c9102d28f7bb6890a80e383993ff7db3c5.tar.bz2
nixpkgs-b8a299c9102d28f7bb6890a80e383993ff7db3c5.tar.lz
nixpkgs-b8a299c9102d28f7bb6890a80e383993ff7db3c5.tar.xz
nixpkgs-b8a299c9102d28f7bb6890a80e383993ff7db3c5.tar.zst
nixpkgs-b8a299c9102d28f7bb6890a80e383993ff7db3c5.zip
python.pkgs.entrypoints: simplify tests
The upstream issue requiring one test to be disabled was fixed:
https://github.com/takluyver/entrypoints/issues/23
Diffstat (limited to 'pkgs/development/python-modules/entrypoints')
-rw-r--r--pkgs/development/python-modules/entrypoints/default.nix12
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix
index 466014715ba..77d20876fe1 100644
--- a/pkgs/development/python-modules/entrypoints/default.nix
+++ b/pkgs/development/python-modules/entrypoints/default.nix
@@ -4,7 +4,6 @@
 , configparser
 , pytest
 , isPy3k
-, isPy27
 }:
 
 buildPythonPackage rec {
@@ -20,15 +19,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = lib.optional (!isPy3k) configparser;
 
-  checkPhase = let
-    # On python2 with pytest 3.9.2 (not with pytest 3.7.4) the test_bad
-    # test fails. It tests that a warning (exectly one) is thrown on a "bad"
-    # path. The pytest upgrade added some warning, resulting in two warnings
-    # being thrown.
-    # upstream: https://github.com/takluyver/entrypoints/issues/23
-    pyTestArgs = if isPy27 then "-k 'not test_bad'" else "";
-  in ''
-    py.test ${pyTestArgs} tests
+  checkPhase = ''
+    py.test tests
   '';
 
   meta = {