Merge staging and PR #35021

It's the last staging commit (mostly) built on Hydra,
and a minimal fix for Darwin regression in pysqlite.

pkgs/development/python-modules/aiohttp/default.nix

@@ -9,7 +9,6 @@
 , idna-ssl
 , pytest
 , gunicorn
-, pytest-raisesregexp
 , pytest-mock
 }:
 
@@ -24,7 +23,7 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.4";
 
-  checkInputs = [ pytest gunicorn pytest-raisesregexp pytest-mock ];
+  checkInputs = [ pytest gunicorn pytest-mock ];
 
   propagatedBuildInputs = [ async-timeout chardet multidict yarl ]
     ++ lib.optional (pythonOlder "3.7") idna-ssl;

pkgs/development/python-modules/async_timeout/default.nix

@@ -1,22 +1,19 @@
 { lib
-, fetchurl
+, fetchPypi
 , buildPythonPackage
 , pytestrunner
 , pythonOlder
 }:
 
-let
+buildPythonPackage rec {
   pname = "async-timeout";
   version = "2.0.0";
-in buildPythonPackage rec {
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "c17d8ac2d735d59aa62737d76f2787a6c938f5a944ecf768a8c0ab70b0dea566";
   };
 
-  buildInputs = [ pytestrunner ];
   # Circular dependency on aiohttp
   doCheck = false;
 
@@ -27,4 +24,4 @@ in buildPythonPackage rec {
     homepage = https://github.com/aio-libs/async_timeout/;
     license = lib.licenses.asl20;
   };
-}
+}

pkgs/development/python-modules/cffi/default.nix

@@ -32,6 +32,7 @@ if isPyPy then null else buildPythonPackage rec {
   # The tests use -Werror but with python3.6 clang detects some unreachable code.
   NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ];
 
+  doCheck = !stdenv.hostPlatform.isMusl; # TODO: Investigate
   checkPhase = ''
     py.test
   '';

pkgs/development/python-modules/chardet/default.nix

@@ -2,7 +2,6 @@
 , pytest, pytestrunner, hypothesis }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "chardet";
   version = "3.0.4";
 
@@ -11,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";
   };
 
-  buildInputs = [ pytest pytestrunner hypothesis ];
+  checkInputs = [ pytest pytestrunner hypothesis ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/chardet/chardet;

pkgs/development/python-modules/multidict/default.nix

@@ -1,8 +1,7 @@
 { lib
 , fetchPypi
 , buildPythonPackage
-, cython
-, pytest, psutil, pytestrunner
+, pytest, pytestrunner
 , isPy3k
 }:
 
@@ -15,8 +14,7 @@ buildPythonPackage rec {
     sha256 = "0liazqlyk2nmr82nhiw2z72j7bjqxaisifkj476msw140d4i4i7v";
   };
 
-  buildInputs = [ cython ];
-  checkInputs = [ pytest psutil pytestrunner ];
+  checkInputs = [ pytest pytestrunner ];
 
   disabled = !isPy3k;
 

pkgs/development/python-modules/pytest-xdist/default.nix

@@ -1,7 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm, pytest-forked }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pytest-xdist";
   version = "1.22.0";
 
@@ -10,21 +9,19 @@ buildPythonPackage rec {
     sha256 = "65228a859191f2c74ee68c127317eefe35eedd3d43fc1431f19240663b0cafcd";
   };
 
-  buildInputs = [ pytest setuptools_scm pytest-forked];
+  nativeBuildInputs = [ setuptools_scm ];
+  buildInputs = [ pytest pytest-forked ];
   propagatedBuildInputs = [ execnet ];
 
-  postPatch = ''
-    rm testing/acceptance_test.py testing/test_remote.py testing/test_slavemanage.py
-  '';
-
   checkPhase = ''
-    py.test testing
+    # Excluded tests access file system
+    py.test testing -k "not test_distribution_rsyncdirs_example \
+                    and not test_rsync_popen_with_path \
+                    and not test_popen_rsync_subdir \
+                    and not test_init_rsync_roots \
+                    and not test_rsyncignore"
   '';
 
-  # Only test on 3.x
-  # INTERNALERROR> AttributeError: 'NoneType' object has no attribute 'getconsumer'
-  doCheck = isPy3k;
-
   meta = with stdenv.lib; {
     description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
     homepage = https://github.com/pytest-dev/pytest-xdist;

pkgs/development/python-modules/testtools/default.nix

@@ -4,33 +4,26 @@
 , pbr
 , python_mimeparse
 , extras
-, lxml
 , unittest2
 , traceback2
-, isPy3k
-, fixtures
-, pyrsistent
+, testscenarios
 }:
 
-
-
 buildPythonPackage rec {
   pname = "testtools";
   version = "2.3.0";
 
-  # Python 2 only judging from SyntaxError
-#   disabled = isPy3k;
-
   src = fetchPypi {
     inherit pname version;
     sha256 = "5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559";
   };
 
-  propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 pyrsistent ];
+  propagatedBuildInputs = [ pbr python_mimeparse extras unittest2 ];
   buildInputs = [ traceback2 ];
 
-  # No tests in archive
+  # testscenarios has a circular dependency on testtools
   doCheck = false;
+  checkInputs = [ testscenarios ];
 
   # testtools 2.0.0 and up has a circular run-time dependency on futures
   postPatch = ''
@@ -42,4 +35,4 @@ buildPythonPackage rec {
     homepage = https://pypi.python.org/pypi/testtools;
     license = lib.licenses.mit;
   };
-}
+}