summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2022-04-12 16:16:05 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2022-04-15 01:39:54 +0200
commit9f340b5bf1cb63f10dd34c3ff69b582216168c75 (patch)
tree7ba81c720d99e8e96b09402862c33beaf0d1c3b2
parent836e3af5447ee51c81566b6717f445213c50f47b (diff)
treewide: remove redundant numprocesses pytest-xdist parameter
Including the pytest-xdist package automatically configures numprocesses to $NIX_BUILD_CORES, so specifying these on a package level has become redundant.
-rw-r--r--pkgs/development/python-modules/alembic/default.nix4
-rw-r--r--pkgs/development/python-modules/ansible-lint/default.nix4
-rw-r--r--pkgs/development/python-modules/build/default.nix2
-rw-r--r--pkgs/development/python-modules/cattrs/default.nix3
-rw-r--r--pkgs/development/python-modules/clickhouse-driver/default.nix2
-rw-r--r--pkgs/development/python-modules/dask/default.nix2
-rw-r--r--pkgs/development/python-modules/datashader/default.nix1
-rw-r--r--pkgs/development/python-modules/debugpy/default.nix1
-rw-r--r--pkgs/development/python-modules/diskcache/default.nix4
-rw-r--r--pkgs/development/python-modules/dm-haiku/default.nix1
-rw-r--r--pkgs/development/python-modules/flax/default.nix1
-rw-r--r--pkgs/development/python-modules/hypothesmith/default.nix1
-rw-r--r--pkgs/development/python-modules/ibis-framework/default.nix1
-rw-r--r--pkgs/development/python-modules/optax/default.nix1
-rw-r--r--pkgs/development/python-modules/pylint/default.nix4
-rw-r--r--pkgs/development/python-modules/scikit-learn/default.nix2
-rw-r--r--pkgs/development/python-modules/tensorflow-datasets/default.nix1
-rw-r--r--pkgs/development/python-modules/yamlfix/default.nix5
-rw-r--r--pkgs/tools/misc/pre-commit/default.nix1
-rw-r--r--pkgs/tools/package-management/pdm/default.nix1
20 files changed, 0 insertions, 42 deletions
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index 1a7487a25f78..ea8f4d4d1318 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -42,10 +42,6 @@ buildPythonPackage rec {
pytest-xdist
];
- pytestFlagsArray = [
- "--numprocesses" "$NIX_BUILD_CORES"
- ];
-
meta = with lib; {
homepage = "https://bitbucket.org/zzzeek/alembic";
description = "A database migration tool for SQLAlchemy";
diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix
index 503247580fb4..37538088b226 100644
--- a/pkgs/development/python-modules/ansible-lint/default.nix
+++ b/pkgs/development/python-modules/ansible-lint/default.nix
@@ -57,10 +57,6 @@ buildPythonPackage rec {
pytestCheckHook
];
- pytestFlagsArray = [
- "--numprocesses" "$NIX_BUILD_CORES"
- ];
-
preCheck = ''
# ansible wants to write to $HOME and crashes if it can't
export HOME=$(mktemp -d)
diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix
index f1f7f0e81bd2..d36804649b7e 100644
--- a/pkgs/development/python-modules/build/default.nix
+++ b/pkgs/development/python-modules/build/default.nix
@@ -52,8 +52,6 @@ buildPythonPackage rec {
];
pytestFlagsArray = [
- "-n"
- "$NIX_BUILD_CORES"
"-W"
"ignore::DeprecationWarning"
];
diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix
index 94a357df98be..69a351e3c341 100644
--- a/pkgs/development/python-modules/cattrs/default.nix
+++ b/pkgs/development/python-modules/cattrs/default.nix
@@ -52,9 +52,6 @@ buildPythonPackage rec {
ujson
];
- pytestFlagsArray = [
- "--numprocesses $NIX_BUILD_CORES"
- ];
postPatch = ''
substituteInPlace pyproject.toml \
diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix
index dd1698f9a3ae..826ce08c1e06 100644
--- a/pkgs/development/python-modules/clickhouse-driver/default.nix
+++ b/pkgs/development/python-modules/clickhouse-driver/default.nix
@@ -57,8 +57,6 @@ buildPythonPackage rec {
# some test in test_buffered_reader.py doesn't seem to return
disabledTestPaths = [ "tests/test_buffered_reader.py" ];
- pytestFlagsArray = [ "-n" "$NIX_BUILD_CORES" ];
-
# most tests require `clickhouse`
# TODO: enable tests after `clickhouse` unbroken
doCheck = false;
diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index ffdca65a606a..79f07c6e88f2 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -67,8 +67,6 @@ buildPythonPackage rec {
'';
pytestFlagsArray = [
- # parallelize
- "--numprocesses $NIX_BUILD_CORES"
# rerun failed tests up to three times
"--reruns 3"
# don't run tests that require network access
diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix
index 152582f6716f..b9630aa07fd4 100644
--- a/pkgs/development/python-modules/datashader/default.nix
+++ b/pkgs/development/python-modules/datashader/default.nix
@@ -70,7 +70,6 @@ buildPythonPackage rec {
'';
pytestFlagsArray = [
- "-n $NIX_BUILD_CORES"
"datashader"
];
diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index 9f6026ce7360..04b78d6c8023 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -84,7 +84,6 @@ buildPythonPackage rec {
# Override default arguments in pytest.ini
pytestFlagsArray = [
"--timeout=0"
- "-n=$NIX_BUILD_CORES"
];
disabledTests = lib.optionals (pythonAtLeast "3.10") [
diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix
index 26cb0e438f01..cf3f7b514b1f 100644
--- a/pkgs/development/python-modules/diskcache/default.nix
+++ b/pkgs/development/python-modules/diskcache/default.nix
@@ -45,10 +45,6 @@ buildPythonPackage rec {
"test_get_many"
];
- pytestFlagsArray = [
- "-n $NIX_BUILD_CORES"
- ];
-
pythonImportsCheck = [
"diskcache"
];
diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix
index 03677faa689f..570d923509a3 100644
--- a/pkgs/development/python-modules/dm-haiku/default.nix
+++ b/pkgs/development/python-modules/dm-haiku/default.nix
@@ -38,7 +38,6 @@ buildPythonPackage rec {
pytestCheckHook
tensorflow
];
- pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
pythonImportsCheck = [
"haiku"
diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix
index 1f1622dc1aea..82675df46c91 100644
--- a/pkgs/development/python-modules/flax/default.nix
+++ b/pkgs/development/python-modules/flax/default.nix
@@ -42,7 +42,6 @@ buildPythonPackage rec {
pytestCheckHook
tensorflow
];
- pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
disabledTestPaths = [
# Docs test, needs extra deps + we're not interested in it.
diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix
index ae02a076bafb..4bac9c0bb022 100644
--- a/pkgs/development/python-modules/hypothesmith/default.nix
+++ b/pkgs/development/python-modules/hypothesmith/default.nix
@@ -39,7 +39,6 @@ buildPythonPackage rec {
pytestFlagsArray = [
"-v"
- "--numprocesses $NIX_BUILD_CORES"
];
disabledTests = [
diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix
index 61b944b48836..e25832fbfcb3 100644
--- a/pkgs/development/python-modules/ibis-framework/default.nix
+++ b/pkgs/development/python-modules/ibis-framework/default.nix
@@ -119,7 +119,6 @@ buildPythonPackage rec {
];
pytestFlagsArray = [
- "--numprocesses $NIX_BUILD_CORES"
"ibis/tests"
"ibis/backends/tests"
"ibis/backends/{${lib.concatStringsSep "," backends}}/tests"
diff --git a/pkgs/development/python-modules/optax/default.nix b/pkgs/development/python-modules/optax/default.nix
index f3790a3f59f4..b0f896a18ebb 100644
--- a/pkgs/development/python-modules/optax/default.nix
+++ b/pkgs/development/python-modules/optax/default.nix
@@ -38,7 +38,6 @@ buildPythonPackage rec {
tensorflow
tensorflow-datasets
];
- pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
pythonImportsCheck = [
"optax"
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index f44615df18b1..9b631bd17b3b 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -65,10 +65,6 @@ buildPythonPackage rec {
export HOME=$TEMPDIR
'';
- pytestFlagsArray = [
- "-n $NIX_BUILD_CORES"
- ];
-
disabledTestPaths = [
# tests miss multiple input files
# FileNotFoundError: [Errno 2] No such file or directory
diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix
index 7e2096c9b9ba..82a85d709413 100644
--- a/pkgs/development/python-modules/scikit-learn/default.nix
+++ b/pkgs/development/python-modules/scikit-learn/default.nix
@@ -78,8 +78,6 @@ buildPythonPackage rec {
# https://github.com/scikit-learn/scikit-learn/issues/17582
# Since we are overriding '-k' we need to include the 'disabledTests' from above manually.
"-k" "'not (NuSVC and memmap) ${toString (lib.forEach disabledTests (t: "and not ${t}"))}'"
-
- "-n" "$NIX_BUILD_CORES"
];
preCheck = ''
diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix
index 1fc9f5ae25dc..1cfbd1ae59c9 100644
--- a/pkgs/development/python-modules/tensorflow-datasets/default.nix
+++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix
@@ -96,7 +96,6 @@ buildPythonPackage rec {
tensorflow
tifffile
];
- pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
disabledTestPaths = [
# Sandbox violations: network access, filesystem write attempts outside of build dir, ...
diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix
index 7243b3891f40..b789aab03701 100644
--- a/pkgs/development/python-modules/yamlfix/default.nix
+++ b/pkgs/development/python-modules/yamlfix/default.nix
@@ -37,11 +37,6 @@ buildPythonPackage rec {
--replace 'python_paths = "."' ""
'';
- pytestFlagsArray = [
- "-n"
- "$NIX_BUILD_CORES"
- ];
-
pythonImportsCheck = [
"yamlfix"
];
diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix
index addd7134b7f8..df211378f4b4 100644
--- a/pkgs/tools/misc/pre-commit/default.nix
+++ b/pkgs/tools/misc/pre-commit/default.nix
@@ -74,7 +74,6 @@ buildPythonPackage rec {
'';
pytestFlagsArray = [
- "--numprocesses $NIX_BUILD_CORES"
"--forked"
];
diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix
index cae4431ea65b..a931578a092d 100644
--- a/pkgs/tools/package-management/pdm/default.nix
+++ b/pkgs/tools/package-management/pdm/default.nix
@@ -71,7 +71,6 @@ buildPythonApplication rec {
];
pytestFlagsArray = [
- "--numprocesses $NIX_BUILD_CORES"
"-m 'not network'"
];