about summary refs log tree commit diff
path: root/pkgs/development/python-modules/can
diff options
context:
space:
mode:
authorKonrad Borowski <konrad@borowski.pw>2020-02-20 15:00:08 +0100
committerJon <jonringer@users.noreply.github.com>2020-02-20 08:43:50 -0800
commit8dd592e3b2cdcf232a8d905ba4fc6d499491e10e (patch)
tree8060be895e0c451bb848cb87ade5692c06cad4a6 /pkgs/development/python-modules/can
parente657a87f801ba44c361e98b983dddb372172cf47 (diff)
downloadnixlib-8dd592e3b2cdcf232a8d905ba4fc6d499491e10e.tar
nixlib-8dd592e3b2cdcf232a8d905ba4fc6d499491e10e.tar.gz
nixlib-8dd592e3b2cdcf232a8d905ba4fc6d499491e10e.tar.bz2
nixlib-8dd592e3b2cdcf232a8d905ba4fc6d499491e10e.tar.lz
nixlib-8dd592e3b2cdcf232a8d905ba4fc6d499491e10e.tar.xz
nixlib-8dd592e3b2cdcf232a8d905ba4fc6d499491e10e.tar.zst
nixlib-8dd592e3b2cdcf232a8d905ba4fc6d499491e10e.zip
pythonPackages.can: remove pytest-timeout check input
pytest-timeout can cause tests to be flaky. It's not
necessary to patch the code, as pytest ignores unrecognized
marks with an ignorable warning.
Diffstat (limited to 'pkgs/development/python-modules/can')
-rw-r--r--pkgs/development/python-modules/can/default.nix7
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index b9d2b4b7751a..8aa80a750678 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -24,12 +24,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing;
-  checkInputs = [ nose mock pytest pytest-timeout hypothesis future ];
-
-  # Tests won't work with hypothesis 4.7.3 under Python 2. So skip the tests in
-  # that case. This clause can be removed once hypothesis has been upgraded in
-  # nixpkgs.
-  doCheck = !(isPy27 && (hypothesis.version == "4.7.3"));
+  checkInputs = [ nose mock pytest hypothesis future ];
 
   # Add the scripts to PATH
   checkPhase = ''