From 5455a45799a604f0ece4ad95b1550405e90888d8 Mon Sep 17 00:00:00 2001 From: "Andreas Billmeier (@Home/mbp)" Date: Sun, 20 Mar 2022 13:53:45 +0100 Subject: [PATCH] remove old pytest-xdist-2.2.1 --- README.md | 4 +- dev-python/pytest-xdist/Manifest | 3 -- ...pytest-xdist-2.2.0-services-conflict.patch | 31 ---------------- .../pytest-xdist/pytest-xdist-2.2.1.ebuild | 37 ------------------- 4 files changed, 2 insertions(+), 73 deletions(-) delete mode 100644 dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch delete mode 100644 dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild diff --git a/README.md b/README.md index 340fd4573..e4184f96c 100644 --- a/README.md +++ b/README.md @@ -496,11 +496,11 @@ From time to time a fresh compile test on empty boxes (one with Python 3.9 and o ## Licenses This repository itself is released under GPL-3 (like most Gentoo repositories), all work on the depending components under the licenses they came from. Perhaps you came here because I filed an issue at your component about a bad or missing license. It is easy to [assign a license](https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository). During cleanups and license investigations I have been asked often which license to choose. I am not a lawyer, but I can offer the following table, counted over this repository, perhaps this helps your decision. If a package has more than one license listed, all of them are counted. -There are 1703 Ebuilds in total, 1696 of them have in total 1704 (35 different) licenses assigned. +There are 1702 Ebuilds in total, 1695 of them have in total 1703 (35 different) licenses assigned. |License| Ebuilds using it| |-------|-----| -|MIT|1033| +|MIT|1032| |Apache-2.0|313| |GPL-3|105| |BSD|92| diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest index bab6dbef8..967b147aa 100644 --- a/dev-python/pytest-xdist/Manifest +++ b/dev-python/pytest-xdist/Manifest @@ -1,6 +1,3 @@ -AUX pytest-xdist-2.2.0-services-conflict.patch 1097 BLAKE2B edc3ecb79578f89e9ce5515e194dc16df34abc2685d9fb78cc5930f29893dbd9e145c95e5b1f58bf252710c57964ea00dc8b71e20fd0aa713e9b9ab2d8d29a93 SHA512 50155aa39d0a87be7a22d0ccf6c9d8eacc8ce4342baa3fd67839b3c5b4d05b31fef5786a60e15051de3000b3ee3494ddb48feba43850d677484e239ee4be8b02 -DIST pytest-xdist-2.2.1.tar.gz 64956 BLAKE2B 7ea18b0e7893000ed9d8718506a7b0f7cf45444196a23e3defec34639c2159b52c7a533ddbc0e0a9b3c3f1e0a867ad5c85e3549167e9b7049ce718646ed50717 SHA512 0732f5ffb56eead3d1aeecd37381c2d9c6ed22398e8e51e9358b562765d737ebde48ecb6fe9f90d9a46902dba1422721cb2c7bfc9fc13918aa2c3b8e6a5e48c4 DIST pytest-xdist-2.4.0.tar.gz 67199 BLAKE2B bba867bfbd1e161ada2157fdb5a10f929fefed959b64afef74453206d91e5014abaaa1363ac9adbc89ed476a841607f6830781817842b9be119a09bda7278b91 SHA512 2d2da6aaa8da07a28d7c6c81a0044493b7d0d1a68921e7ec94cfd2f698eaa5594b6da4d82524804637d5cc061fbe19034f3c65a07ee5a0c906170856edc3d383 -EBUILD pytest-xdist-2.2.1.ebuild 926 BLAKE2B ee5e3cefd7a0f03bf60ee39f8443f3ab4ed15d4833dc3403e36123dba4c2f73edf456a9ca9ca53dd3f38a00a33ebc745f251812edfc67c4573e9c6bf3e45e0ab SHA512 7c2733a879e8646e3ccd21df8b9579c8455c7165fac002bea586ebd107510b1fc5795b22ed81b05e03499c942e29cc0b63503e2b2b70b790ff50d6bd91fbf6e4 EBUILD pytest-xdist-2.4.0.ebuild 1158 BLAKE2B fd617b12aa19dec1f7f85bce83025ab6c0ca8d913e8a8cfd1a3247c7cedd4cbb4a0d9aa97d6f8e497379578d0e2e7dc322b96d5db2c4373844a195fdfee4be3b SHA512 e37fb1565e462690e5cecb8c70fe4013fc8033d071dd1c83ec9f11215b2ea0508911c3e284907126c80496d4a1985077cf710c827bee1b1e640fd004038e85e0 MISC metadata.xml 495 BLAKE2B e9b6fb711fef224e63b2b4c1137e46b1b0706d9c47f1bfbd2b3d9da78a5fa4d61fa9a78a94cf75a7e3e7b1d96ad15e6e38f00d3041e7ddda53a468139338b554 SHA512 e126cc5ef4e81af7c2cba1486988b0d119789763cc7d7b952fc6d6292153e7f1cbefd82fb472e7813eb0d4a65cfe15a9db662d59e661787d4ab8463d93277396 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 deleted file mode 100644 index 2c911601b..000000000 --- a/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 082beb2ce0fe1f338311d85e656b962df8a16ce1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -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.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild deleted file mode 100644 index 0276a065b..000000000 --- a/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} 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" - -# pytest-xdist >= 2 fails with pytest < 6 -RDEPEND=" - dev-python/execnet[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - >=dev-python/pytest-6[${PYTHON_USEDEP}] - dev-python/pytest-forked[${PYTHON_USEDEP}] -" - -BDEPEND=" - dev-python/setuptools_scm[${PYTHON_USEDEP}] - test? ( - dev-python/filelock[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.2.0-services-conflict.patch -) - -distutils_enable_tests --install pytest