summary refs log tree commit diff
path: root/pkgs/development/python-modules
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2017-08-25 19:03:41 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2017-08-25 19:36:20 +0200
commit2923300a5fdf41ef4620f7f33355df7118920263 (patch)
treef667e6b626d53d9da68c124eaf6e4e4e6840fea5 /pkgs/development/python-modules
parent78c7b40062f0b913038c25ab471e9e98011e3b0e (diff)
downloadnixlib-2923300a5fdf41ef4620f7f33355df7118920263.tar
nixlib-2923300a5fdf41ef4620f7f33355df7118920263.tar.gz
nixlib-2923300a5fdf41ef4620f7f33355df7118920263.tar.bz2
nixlib-2923300a5fdf41ef4620f7f33355df7118920263.tar.lz
nixlib-2923300a5fdf41ef4620f7f33355df7118920263.tar.xz
nixlib-2923300a5fdf41ef4620f7f33355df7118920263.tar.zst
nixlib-2923300a5fdf41ef4620f7f33355df7118920263.zip
python.pkgs.sqlalchemy: use pytest_30 and don't use pytest_xdist
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r--pkgs/development/python-modules/sqlalchemy/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index a6fefaa16121..27a3c4ac2ae3 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -1,7 +1,7 @@
 { lib
 , fetchPypi
 , buildPythonPackage
-, pytest
+, pytest_30
 , mock
 , pytest_xdist
 , isPy3k
@@ -18,12 +18,12 @@ buildPythonPackage rec {
     sha256 = "2a98ac87b30eaa2bee1f1044848b9590e476e7f93d033c6542e60b993a5cf898";
   };
 
-  checkInputs = [ pytest mock pytest_xdist ]
-    ++ lib.optional (!isPy3k) pysqlite;
-
-  # Test-only dependency pysqlite doesn't build on Python 3. This isn't an
-  # acceptable reason to make all dependents unavailable on Python 3 as well
-  #doCheck = !(isPyPy || isPy3k);
+  checkInputs = [
+    pytest_30
+    mock
+#     Disable pytest_xdist tests for now, because our version seems to be too new.
+#     pytest_xdist
+  ] ++ lib.optional (!isPy3k) pysqlite;
 
   checkPhase = ''
     py.test