Fix collection23

pkgs/applications/audio/quodlibet/default.nix

@@ -35,18 +35,18 @@ python3.pkgs.buildPythonApplication rec {
 
   LC_ALL = "en_US.UTF-8";
 
-  pytestFlags = lib.optionals (xineBackend || !withGstPlugins) [
-    "--ignore=tests/plugin/test_replaygain.py"
+  disabledTestPaths = lib.optionals (xineBackend || !withGstPlugins) [
+    "tests/plugin/test_replaygain.py"
   ] ++ [
     # requires networking
-    "--ignore=tests/test_browsers_iradio.py"
+    "tests/test_browsers_iradio.py"
     # the default theme doesn't have the required icons
-    "--ignore=tests/plugin/test_trayicon.py"
+    "tests/plugin/test_trayicon.py"
     # upstream does actually not enforce source code linting
-    "--ignore=tests/quality"
+    "tests/quality"
     # build failure on Arch Linux
     # https://github.com/NixOS/nixpkgs/pull/77796#issuecomment-575841355
-    "--ignore=tests/test_operon.py"
+    "tests/test_operon.py"
   ];
 
   checkPhase = ''

pkgs/applications/misc/gallery-dl/default.nix

@@ -12,10 +12,10 @@ buildPythonApplication rec {
   propagatedBuildInputs = [ requests ];
 
   checkInputs = [ pytestCheckHook ];
-  pytestFlagsArray = [
+  disabledTestPaths = [
     # requires network access
-    "--ignore=test/test_results.py"
-    "--ignore=test/test_downloader.py"
+    "test/test_results.py"
+    "test/test_downloader.py"
   ];
 
   meta = with lib; {

pkgs/applications/networking/errbot/default.nix

@@ -70,7 +70,7 @@ buildPythonApplication rec {
   ];
 
   # Slack backend test has an import issue
-  pytestFlagsArray = [ "--ignore=tests/backend_tests/slack_test.py" ];
+  disabledTestPaths = [ "tests/backend_tests/slack_test.py" ];
 
   disabledTests = [
     "backup"

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

@@ -43,12 +43,12 @@ buildPythonPackage rec {
     uvloop
   ];
 
-  pytestFlagsArray = [
+  disabledTestPaths = [
     # lots of DNS lookups
-    "--ignore=tests/test_sockets.py"
+    "tests/test_sockets.py"
   ] ++ lib.optionals stdenv.isDarwin [
     # darwin sandboxing limitations
-    "--ignore=tests/streams/test_tls.py"
+    "tests/streams/test_tls.py"
   ];
 
   pythonImportsCheck = [ "anyio" ];

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

@@ -42,10 +42,10 @@ buildPythonPackage rec {
 
   checkInputs = [ pytestCheckHook nose ];
 
-  pytestFlagsArray = lib.optionals (pythonOlder "3.4") [
+  disabledTestPaths = lib.optionals (pythonOlder "3.4") [
     # Use enums, which aren't available pre-python3.4
-    "--ignore=tests/test_resolver.py"
-    "--ignore=tests/test_search.py"
+    "tests/test_resolver.py"
+    "tests/test_search.py"
   ];
 
   meta = with lib; {

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

@@ -24,9 +24,9 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pytestFlagsArray = [
+  disabledTestPaths = [
     # jwt package is not available in nixpkgs
-    "--ignore=auth0/v3/test/authentication/test_token_verifier.py"
+    "auth0/v3/test/authentication/test_token_verifier.py"
   ];
 
   # tries to ping websites (e.g. google.com)

pkgs/development/python-modules/cassandra-driver/default.nix

@@ -32,7 +32,9 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [ cython ];
+
   buildInputs = [ libev ];
+
   propagatedBuildInputs = [ six geomet ]
     ++ lib.optionals (pythonOlder "3.4") [ futures ];
 
@@ -46,9 +48,6 @@ buildPythonPackage rec {
     # increase tolerance for time-based test
     substituteInPlace tests/unit/io/utils.py --replace 'delta=.15' 'delta=.3'
   '';
-  postCheck = ''
-    unset NIX_REDIRECTS LD_PRELOAD
-  '';
 
   checkInputs = [
     pytestCheckHook
@@ -66,16 +65,24 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [
     "tests/unit"
+  ];
+
+  disabledTestPaths = [
     # requires puresasl
-    "--ignore=tests/unit/advanced/test_auth.py"
+    "tests/unit/advanced/test_auth.py"
   ];
+
   disabledTests = [
     # doesn't seem to be intended to be run directly
     "_PoolTests"
     # attempts to make connection to localhost
     "test_connection_initialization"
   ];
 
+  postCheck = ''
+    unset NIX_REDIRECTS LD_PRELOAD
+  '';
+
   meta = with lib; {
     description = "A Python client driver for Apache Cassandra";
     homepage = "http://datastax.github.io/python-driver";

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

@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchPypi
 , billiard, click, click-didyoumean, click-plugins, click-repl, kombu, pytz, vine
-, boto3, case, moto, pytest, pytest-celery, pytest-subtests, pytest-timeout
+, boto3, case, moto, pytestCheckHook, pytest-celery, pytest-subtests, pytest-timeout
 }:
 
 buildPythonPackage rec {
@@ -19,20 +19,26 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ billiard click click-didyoumean click-plugins click-repl kombu pytz vine ];
 
-  checkInputs = [ boto3 case moto pytest pytest-celery pytest-subtests pytest-timeout ];
+  checkInputs = [ boto3 case moto pytestCheckHook pytest-celery pytest-subtests pytest-timeout ];
 
   # ignore test that's incompatible with pytest5
   # test_eventlet touches network
   # test_mongodb requires pymongo
   # test_multi tries to create directories under /var
-  checkPhase = ''
-    pytest -k 'not restore_current_app_fallback and not msgpack and not on_apply and not pytest' \
-      --ignore=t/unit/contrib/test_pytest.py \
-      --ignore=t/unit/concurrency/test_eventlet.py \
-      --ignore=t/unit/bin/test_multi.py \
-      --ignore=t/unit/apps/test_multi.py \
-      --ignore=t/unit/backends/test_mongodb.py
-  '';
+  disabledTestPaths = [
+    "t/unit/contrib/test_pytest.py"
+    "t/unit/concurrency/test_eventlet.py"
+    "t/unit/bin/test_multi.py"
+    "t/unit/apps/test_multi.py"
+    "t/unit/backends/test_mongodb.py"
+  ];
+
+  disabledTests = [
+    "restore_current_app_fallback"
+    "msgpack"
+    "on_apply"
+    "pytest"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/celery/celery/";

pkgs/development/python-modules/cherrypy/17.nix

@@ -1,7 +1,6 @@
 { lib, stdenv, buildPythonPackage, fetchPypi
-, setuptools_scm
-, cheroot, contextlib2, portend, routes, six, zc_lockfile
-, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt
+, setuptools_scm, cheroot, contextlib2, portend, routes, six, zc_lockfile
+, backports_unittest-mock, objgraph, pathpy, pytestCheckHook, pytestcov, backports_functools_lru_cache, requests_toolbelt
 }:
 
 buildPythonPackage rec {
@@ -21,12 +20,12 @@ buildPythonPackage rec {
   nativeBuildInputs = [ setuptools_scm ];
 
   checkInputs = [
-    backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt
+    backports_unittest-mock objgraph pathpy pytestCheckHook pytestcov backports_functools_lru_cache requests_toolbelt
   ];
 
-  checkPhase = ''
-    pytest ${lib.optionalString stdenv.isDarwin "--ignore=cherrypy/test/test_wsgi_unix_socket.py"}
-  '';
+  disabledTestPaths = lib.optionals stdenv.isDarwin [
+    "cherrypy/test/test_wsgi_unix_socket.py"
+  ];
 
   meta = with lib; {
     homepage = "https://www.cherrypy.org";

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

@@ -28,7 +28,6 @@
 buildPythonPackage rec {
   pname = "cirq";
   version = "0.9.1";
-
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
@@ -69,6 +68,7 @@ buildPythonPackage rec {
   doCheck = true;
   # pythonImportsCheck = [ "cirq" "cirq.Circuit" ];  # cirq's importlib hook doesn't work here
   dontUseSetuptoolsCheck = true;
+
   checkInputs = [
     pytestCheckHook
     pytest-asyncio
@@ -80,10 +80,14 @@ buildPythonPackage rec {
   ];
 
   pytestFlagsArray = [
-    "--ignore=dev_tools"  # Only needed when developing new code, which is out-of-scope
-    "--ignore=cirq/contrib/"  # requires external (unpackaged) python packages, so untested.
     "--benchmark-disable" # Don't need to run benchmarks when packaging.
   ];
+
+  disabledTestPaths = [
+    "dev_tools"  # Only needed when developing new code, which is out-of-scope
+    "cirq/contrib/"  # requires external (unpackaged) python packages, so untested.
+  ];
+
   disabledTests = [
     "test_convert_to_ion_gates" # fails on some systems due to rounding error, 0.75 != 0.750...2
   ] ++ lib.optionals stdenv.isAarch64 [

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

@@ -4,7 +4,6 @@
 , glibcLocales
 , lib
 , pythonOlder
-
 , aiohttp
 , aiohttp-swagger
 , aiohttp-jinja2
@@ -51,9 +50,9 @@ buildPythonPackage rec {
     flask
     swagger-ui-bundle
   ]
-  ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson pytest-aiohttp ]
-  ++ lib.optional (pythonOlder "3.7") glibcLocales
-  ;
+    ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson pytest-aiohttp ]
+    ++ lib.optional (pythonOlder "3.7") glibcLocales;
+
   propagatedBuildInputs = [
     clickclick
     jsonschema
@@ -64,11 +63,9 @@ buildPythonPackage rec {
     openapi-spec-validator
     swagger-ui-bundle
     flask
-  ]
-  ++ lib.optional (pythonOlder "3.4") pathlib
-  ++ lib.optional (pythonOlder "3.6") typing
-  ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson ]
-  ;
+  ] ++ lib.optional (pythonOlder "3.4") pathlib
+    ++ lib.optional (pythonOlder "3.6") typing
+    ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson ];
 
   preConfigure = lib.optional (pythonOlder "3.7") ''
     export LANG=en_US.UTF-8

pkgs/development/python-modules/dask-image/default.nix

@@ -5,7 +5,7 @@
 , numpy, toolz # dask[array]
 , scipy
 , pims
-, pytest
+, pytestCheckHook
 , pytest-flake8
 , scikitimage
 }:
@@ -20,9 +20,11 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [ pytest-flake8 ];
+
   propagatedBuildInputs = [ dask numpy toolz scipy pims ];
+
   checkInputs = [
-    pytest
+    pytestCheckHook
     scikitimage
   ];
 
@@ -34,9 +36,10 @@ buildPythonPackage rec {
   '';
 
   # scikit.external is not exported
-  checkPhase = ''
-    pytest --ignore=tests/test_dask_image/
-  '';
+  disabledTestPaths = [
+    "tests/test_dask_image"
+  ];
+
   pythonImportsCheck = [ "dask_image" ];
 
   meta = with lib; {

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

@@ -4,7 +4,7 @@
 , sqlalchemy
 , aiocontextvars
 , isPy27
-, pytest
+, pytestCheckHook
 , asyncpg
 , aiomysql
 , aiosqlite
@@ -28,17 +28,18 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
-    pytest
+    pytestCheckHook
     asyncpg
     aiomysql
     aiosqlite
   ];
 
   # big chunk to tests depend on existing posgresql and mysql databases
   # some tests are better than no tests
-  checkPhase = ''
-    pytest --ignore=tests/test_integration.py --ignore=tests/test_databases.py
-  '';
+  disabledTestPaths = [
+    "tests/test_integration.py"
+    "tests/test_databases.py"
+  ];
 
   meta = with lib; {
     description = "Async database support for Python";

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

@@ -31,8 +31,8 @@ buildPythonPackage rec {
   ];
 
   # avoid tests which import random2, an abandoned library
-  pytestFlagsArray = [
-    "--ignore=tests/providers/test_ssn.py"
+  disabledTestPaths = [
+    "tests/providers/test_ssn.py"
   ];
   pythonImportsCheck = [ "faker" ];
 

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

@@ -51,7 +51,7 @@ buildPythonPackage rec {
   ];
 
   # disabled tests require orjson which requires rust nightly
-  pytestFlagsArray = [ "--ignore=tests/test_default_response_class.py" ];
+  disabledTestPaths = [ "tests/test_default_response_class.py" ];
   disabledTests = [ "test_get_custom_response" ];
 
   meta = with lib; {

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

@@ -19,15 +19,15 @@ buildPythonPackage rec {
   checkInputs = [ pytestCheckHook ];
 
   # skip tests which require being online to download test vectors
-  pytestFlags = [
-     "--ignore=fastecdsa/tests/test_wycheproof_vectors.py"
-     "--ignore=fastecdsa/tests/test_rfc6979_ecdsa.py"
+  disabledTestPaths = [
+     "fastecdsa/tests/test_wycheproof_vectors.py"
+     "fastecdsa/tests/test_rfc6979_ecdsa.py"
   ];
 
   # skip tests for now, they fail with
   # ImportError: cannot import name '_ecdsa' from 'fastecdsa'
   # but the installed package works just fine
-  doCheck = false;
+  # doCheck = false;
 
   pythonImportsCheck = [ "fastecdsa" ];