diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-18 11:06:49 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-18 11:06:49 +0000 |
commit | ab3da91fb6c91a9df52fff8f991570f456fd3c7a (patch) | |
tree | e8f3bfa2c6c3d20ec3b9c352c839e23949068b6b /dev-python/pytest-xdist | |
parent | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (diff) |
gentoo resync : 18.12.2020
Diffstat (limited to 'dev-python/pytest-xdist')
-rw-r--r-- | dev-python/pytest-xdist/Manifest | 3 | ||||
-rw-r--r-- | dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch | 31 | ||||
-rw-r--r-- | dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild | 36 |
3 files changed, 70 insertions, 0 deletions
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest index 89388cf92b1f..1a549131c7cc 100644 --- a/dev-python/pytest-xdist/Manifest +++ b/dev-python/pytest-xdist/Manifest @@ -1,6 +1,9 @@ AUX pytest-xdist-1.34.0-pytest4.patch 1839 BLAKE2B 6f16b51b8b8415390d66b5763afe038e035e22f4f5e2db637497284c52a0eb271d4fc2a9585414ca5d3e34354ca84e2f291b10344331cc1c25663d616f34c7d4 SHA512 d25119e0f26b4b9e97764c962c83e43ca5564e27f711374ee1d1932de0917b30671e29c98799f61bd436f6b560abbbf379a24ce79271c5dbc7ed4563ee145b4b +AUX pytest-xdist-2.2.0-services-conflict.patch 1097 BLAKE2B edc3ecb79578f89e9ce5515e194dc16df34abc2685d9fb78cc5930f29893dbd9e145c95e5b1f58bf252710c57964ea00dc8b71e20fd0aa713e9b9ab2d8d29a93 SHA512 50155aa39d0a87be7a22d0ccf6c9d8eacc8ce4342baa3fd67839b3c5b4d05b31fef5786a60e15051de3000b3ee3494ddb48feba43850d677484e239ee4be8b02 DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24 DIST pytest-xdist-2.1.0.tar.gz 66332 BLAKE2B ac3c19a32bb9153537edfcf55bc656011661cf0d166da1aba969055a398616bb5782534a12ba354175be722c070fcfb2013d58405048814a3d11434a314e38b8 SHA512 85c69d8e649a19de5639738eae4cb213dc7323d96883ec82f39ab51a196346edd9fadbaf97f9763ac0dea104bc123d521264a39d2701878edfa76ce7e5bb347b +DIST pytest-xdist-2.2.0.tar.gz 64781 BLAKE2B 17287c28f31c42c6a8fe3622d4ba920a530e0ced3bc99cffd8f9de91c3498cc2a3b654cc32bd5b09ee8ec6c1f64226aec736acafd73397be2eb34bd3d192bb46 SHA512 2027f8512fbd6cb68ab36eb774b9d8b7e855c181733b884f394d0e84994926b4fe6158dbd55808328b262497036f101e71cb86553340eba0031d654f34541689 EBUILD pytest-xdist-1.34.0-r1.ebuild 1036 BLAKE2B f576f44fdb55876e9cf7ccaec9ce5ffeede2095111a48f2455da590cc4c053ffac094b21baad142dc9ed54c654af423b29c4f7719dd32ff49da2d2f149e666d3 SHA512 3dc96e04f982a62f24f9ab9b2748dbd1a97c486ae3feee09b2e6fbd1ae4af6910455c456537453fa48d3cb85e03ac09acd7d26512a054e3aff83b5dc28591f62 EBUILD pytest-xdist-2.1.0.ebuild 1147 BLAKE2B 5f8b2db3dda86e53857ae6155e4c13ec868f744b9113c012ee961cd651584f010125d3ae3539deb5b3bab106397211cea17de81f8c506e9d1fc7e2cc50a4f7b7 SHA512 c9ac3c5c1d0e4d728e0edaa5ae122248a0c6d7ef426573e50274385b0ccca14feb3dc4a1112e00f11a23bf8529a036430b8f239cfde386d0c9cc407dd19ba5a4 +EBUILD pytest-xdist-2.2.0.ebuild 917 BLAKE2B c19d098863698507d64abf3724e0de9e411ed797f30e75d3d3e6be0c087830c1d54305b04d2e6e15175fecc25020a26957f7472203d33303619d1e4bfd39a4c2 SHA512 2af3e8f5fae4fc3a1a8b9ab51c7ac9f9fe1d7a4e05b9f6e03d1a9f067e840c1d18d551f13b192e041566d4b05a82318735be746eaff728bf0c2ca76b85d2e8b3 MISC metadata.xml 402 BLAKE2B 9e24660b4146f94ecdf375e3bd89a9ab01157ab7c7e9b37fa183eaad12edfbb6574ecef4a98e6079b3dd81e6614b5eb23b0bfd69c9468abde7bbc073e8ef44b4 SHA512 7fbab209b81bba0684b9dad109dc7ba64f9c496e5ad69fcbc659f9361aa131f6779a5419a54112b4ff1c2a63a9deef5f36791551165b1b4b7219c7a00fe93060 diff --git a/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch b/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch new file mode 100644 index 000000000000..2c911601b070 --- /dev/null +++ b/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch @@ -0,0 +1,31 @@ +From 082beb2ce0fe1f338311d85e656b962df8a16ce1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Tue, 15 Dec 2020 11:38:53 +0100 +Subject: [PATCH] Disable pytest-services plugin in test to avoid worker_id + conflict + +Pass "-p no:pytest-services" in test_worker_id_fixture() to ensure +that the presence (and implicit loading) of pytest-services will not +cause the test to fail via overriding worker name. + +Fixes #611 +--- + testing/acceptance_test.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py +index c273bfa..3bea8fc 100644 +--- a/testing/acceptance_test.py ++++ b/testing/acceptance_test.py +@@ -1025,7 +1025,7 @@ def test_worker_id_fixture(testdir, n): + f.write(worker_id) + """ + ) +- result = testdir.runpytest(f, "-n%d" % n) ++ result = testdir.runpytest(f, "-n%d" % n, "-p", "no:pytest-services") + result.stdout.fnmatch_lines("* 2 passed in *") + worker_ids = set() + for fname in glob.glob(str(testdir.tmpdir.join("*.txt"))): +-- +2.29.2 + diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild new file mode 100644 index 000000000000..7cb664b2df30 --- /dev/null +++ b/dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Distributed testing and loop-on-failing modes" +HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" + +# please do not depend on pytest to avoid unnecessary USEDEP enforcement +RDEPEND=" + dev-python/execnet[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pytest-forked[${PYTHON_USEDEP}] +" + +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + test? ( + dev-python/filelock[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}"/${P}-services-conflict.patch +) + +distutils_enable_tests --install pytest |