From 2923300a5fdf41ef4620f7f33355df7118920263 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 25 Aug 2017 19:03:41 +0200 Subject: [PATCH] python.pkgs.sqlalchemy: use pytest_30 and don't use pytest_xdist --- .../python-modules/sqlalchemy/default.nix | 14 +++++++------- 1 file 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