Merge master into staging-next

2019-10-18 12:26:11 +02:00
parent ddee207259 f702ae1516
commit c51c2f79b2
101 changed files with 7073 additions and 1246 deletions
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k
+{ lib, fetchPypi, buildPythonPackage, isPy3k, isPy35
 , mock
 , pysqlite
 , pytest
@@ -22,7 +22,9 @@ buildPythonPackage rec {
    sed -e 's:--max-worker-restart=5::g' -i setup.cfg
  '';

-  checkPhase = ''
+  checkPhase = if isPy35 then ''
+    pytest test -k 'not exception_persistent_flush_py3k'
+  '' else ''
    pytest test
  '';