pyrox.dev
Merge pull request #110601 from dotlambda/pytest_xdist-2.2.0
python3Packages.pytest_xdist: 2.1.0 -> 2.2.0
authored by Robert Schütz and committed by GitHub 76048fe4 b2ce768e
+5
-5
pkgs/development/python-modules/psautohint/default.nix
+5
-5
pkgs/development/python-modules/psautohint/default.nix
···
2
2
, fonttools
3
3
, lxml, fs # for fonttools extras
4
4
, setuptools_scm
5
-
, pytestCheckHook, pytest_5, pytestcov, pytest_xdist
5
+
, pytestCheckHook, pytestcov, pytest_xdist
6
6
}:
7
7
8
8
buildPythonPackage rec {
···
30
30
propagatedBuildInputs = [ fonttools lxml fs ];
31
31
32
32
checkInputs = [
33
-
# Override pytestCheckHook to use pytest v5, because some tests fail on pytest >= v6
34
-
# https://github.com/adobe-type-tools/psautohint/issues/284#issuecomment-742800965
35
-
# Override might be able to be removed in future, check package dependency pins (coverage.yml)
36
-
(pytestCheckHook.override{ pytest = pytest_5; })
33
+
pytestCheckHook
37
34
pytestcov
38
35
pytest_xdist
39
36
];
40
37
disabledTests = [
38
+
# Test that fails on pytest >= v6
39
+
# https://github.com/adobe-type-tools/psautohint/issues/284#issuecomment-742800965
40
+
"test_hashmap_old_version"
41
41
# Slow tests, reduces test time from ~5 mins to ~30s
42
42
"test_mmufo"
43
43
"test_flex_ufo"
+6
-7
pkgs/development/python-modules/pytest-forked/default.nix
+6
-7
pkgs/development/python-modules/pytest-forked/default.nix
···
2
2
, buildPythonPackage
3
3
, fetchPypi
4
4
, setuptools_scm
5
+
, py
5
6
, pytest
7
+
, pytestCheckHook
6
8
}:
7
9
8
10
buildPythonPackage rec {
···
14
16
sha256 = "6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca";
15
17
};
16
18
17
-
buildInputs = [ pytest setuptools_scm ];
19
+
nativeBuildInputs = [ setuptools_scm ];
18
20
19
-
# Do not function
20
-
doCheck = false;
21
+
propagatedBuildInputs = [ py pytest ];
21
22
22
-
checkPhase = ''
23
-
py.test testing
24
-
'';
23
+
checkInputs = [ pytestCheckHook ];
25
24
26
25
meta = {
27
26
description = "Run tests in isolated forked subprocesses";
28
27
homepage = "https://github.com/pytest-dev/pytest-forked";
29
28
license = lib.licenses.mit;
29
+
maintainers = with lib.maintainers; [ dotlambda ];
30
30
};
31
-
32
31
}
+27
-16
pkgs/development/python-modules/pytest-xdist/default.nix
+27
-16
pkgs/development/python-modules/pytest-xdist/default.nix
···
1
-
{ lib, fetchPypi, buildPythonPackage, execnet, pytest_6
2
-
, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }:
1
+
{ lib
2
+
, buildPythonPackage
3
+
, fetchPypi
4
+
, isPy27
5
+
, setuptools_scm
6
+
, pytestCheckHook
7
+
, filelock
8
+
, execnet
9
+
, pytest
10
+
, pytest-forked
11
+
, psutil
12
+
}:
3
13
4
14
buildPythonPackage rec {
5
15
pname = "pytest-xdist";
6
-
version = "2.1.0";
7
-
disabled = !isPy3k;
16
+
version = "2.2.0";
17
+
disabled = isPy27;
8
18
9
19
src = fetchPypi {
10
20
inherit pname version;
11
-
sha256 = "0wh6pn66nncfs6ay0n863bgyriwsgppn8flx5l7551j1lbqkinc2";
21
+
sha256 = "1d8edbb1a45e8e1f8e44b1260583107fc23f8bc8da6d18cb331ff61d41258ecf";
12
22
};
13
23
14
-
nativeBuildInputs = [ setuptools_scm pytest_6 ];
15
-
checkInputs = [ pytest_6 filelock ];
16
-
propagatedBuildInputs = [ execnet pytest-forked psutil six ];
24
+
nativeBuildInputs = [ setuptools_scm ];
25
+
checkInputs = [ pytestCheckHook filelock ];
26
+
propagatedBuildInputs = [ execnet pytest pytest-forked psutil ];
17
27
18
-
# pytest6 doesn't allow for new lines
19
-
# capture_deprecated not compatible with latest pytest6
20
-
checkPhase = ''
21
-
# Excluded tests access file system
22
-
export HOME=$TMPDIR
23
-
pytest -n $NIX_BUILD_CORES \
24
-
-k "not (distribution_rsyncdirs_example or rsync or warning_captured_deprecated_in_pytest_6)"
25
-
'';
28
+
# access file system
29
+
disabledTests = [
30
+
"test_distribution_rsyncdirs_example"
31
+
"test_rsync_popen_with_path"
32
+
"test_popen_rsync_subdir"
33
+
"test_rsync_report"
34
+
"test_init_rsync_roots"
35
+
"test_rsyncignore"
36
+
];
26
37
27
38
meta = with lib; {
28
39
description = "py.test xdist plugin for distributed testing and loop-on-failing modes";