gentoo auto-resync : 01:03:2025 - 19:28:40

4 files changed, 16 insertions, 109 deletions

diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 4b816dd899ea..6689d104d533 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,6 +1,3 @@
-AUX pytest-cov-4.0.0-pytest-xdist-2.5.0.patch 750 BLAKE2B 018b270c47f1c19c19f9d72da935457a6042bcafa580d85f904d082fda9980d9a34579174b7b08551d6cedfbc6a6c7abd7be0216df0e21be64e49efe9d3dd1f5 SHA512 e8826ae013c7fb4cbe57975821faea9a8cfd2573befb4f961560e650cbced56e2dff3e02cde23e29e0bb5d06ce0d5893dc408c9e244ce014a5766c5a565f8efa
-DIST pytest-cov-5.0.0.tar.gz 63042 BLAKE2B 6a0f3b38bbf6ae8843d804d078b3879e76ef146ba1bee2eb068bffe560332984994a8405964be185b2ededc2c8231288e609573c5a83143147eeb537659da1e5 SHA512 384459cafdb800711b935899acc3716f5fcbc28b40be0e168e58333603b1dea474bbd7a92f09b6afbe2f9dc1ce8599668a787c0f93884c263af894f44311a4a6
 DIST pytest-cov-6.0.0.tar.gz 66945 BLAKE2B 8746915eb23b7d524e15ece1a05d5a1c8de6e8e08b807142e9a03f48605d54f715396d73cdb4ee5004dc5703ac0f68309e700d783ebb2037fc861e00033c35f3 SHA512 2947a032417d60867595bb65630942ff5d8a61523af5298e3f169420b28882f9b4256d89980a9cbe88c34f9b7fa759f44fd64d391ad86c1491a55f9a70282bf0
-EBUILD pytest-cov-5.0.0.ebuild 1640 BLAKE2B d22629eded726cb53bd441e0c2bb8ff4e65ccb92edea7188bf6d4f565face2570243d692c34614bca740f6cc1a03b0e980735263c2b1d522499b9f56fe43ebf7 SHA512 949b2a44494012c1d662d4e9491ba18273f4550b4b6ac5c1b5cf64431f522a8a7528b32f66f4bff96cd52a4f772eab77515ee1bc6c2fcc2dbb56ec0716961cc5
-EBUILD pytest-cov-6.0.0.ebuild 1646 BLAKE2B 811ab6e7bc93ba653c03951f9fe908c615ba48bc8b05c2629bec6efd88fa19943fe7e837b241bd62b8b7b19cb7ad279433257abcecd9048b40eaabb115fbf502 SHA512 059f75e3d73563f188e090d75288637471607a41f4d85cf975d25d99f00fd1214a62caaa3d9df30639588e2810d8f4c774502bc14b50a140e1e667186b9f5397
+EBUILD pytest-cov-6.0.0.ebuild 1580 BLAKE2B 4d3d9aedff68c5fed98136661e93dc43da19139008e9f69c50990993ec73858a3569f16951072a34c64439711ba4eda10818f657bc0f2a53282443157e92027e SHA512 4e293727d857173b0e9cdf1673a9a5bca1969c9efec6dba4f9b0e460cb4df94bd19e9ad1f86ff723ce7e99649d74116eed3afa4074bd609d718ddcef4c91817a
 MISC metadata.xml 412 BLAKE2B 0d79131c6fd8adf72493a7c333959e065cf4f2231f6c770800b6d05ff9afcc246cd202406bea6e28f6b0fd23ee6197aa8dac2dd59d0a89d9b07741f57e8fa5e8 SHA512 d1aab9ea8042bf810398a4195fd3595a8abbeb060ab38fd7b7e40085c8d5f22ecb78bab02e2331d4588199d88e0d3848413d75a18fe4373ecd9940a3c990c604
diff --git a/dev-python/pytest-cov/files/pytest-cov-4.0.0-pytest-xdist-2.5.0.patch b/dev-python/pytest-cov/files/pytest-cov-4.0.0-pytest-xdist-2.5.0.patch
deleted file mode 100644
index 6ed3456597cf..000000000000
--- a/dev-python/pytest-cov/files/pytest-cov-4.0.0-pytest-xdist-2.5.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/pytest-dev/pytest-cov/issues/566
-https://github.com/pytest-dev/pytest-cov/pull/565
-
-From 97483386bde4febe7ff48726f887cc6423d308b9 Mon Sep 17 00:00:00 2001
-From: Chedi <chedi.toueiti@gmail.com>
-Date: Tue, 15 Nov 2022 11:18:31 +0100
-Subject: [PATCH] disabling boxed test if version xdist newer than 2.5.0
-
---- a/tests/test_pytest_cov.py
-+++ b/tests/test_pytest_cov.py
-@@ -1555,7 +1555,8 @@ def test_foo():
- 
- SCRIPT_SIMPLE_RESULT = '4 * 100%'
- 
--
-+@pytest.mark.skipif('tuple(map(int, xdist.__version__.split("."))) >= (2, 5, 0)',
-+                    reason="--boxed option was removed in version 2.5.0")
- @pytest.mark.skipif('sys.platform == "win32"')
- def test_dist_boxed(testdir):
-     script = testdir.makepyfile(SCRIPT_SIMPLE)
-
diff --git a/dev-python/pytest-cov/pytest-cov-5.0.0.ebuild b/dev-python/pytest-cov/pytest-cov-5.0.0.ebuild
deleted file mode 100644
index e936b7e8a0c3..000000000000
--- a/dev-python/pytest-cov/pytest-cov-5.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="pytest plugin for coverage reporting"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-cov/
-	https://pypi.org/project/pytest-cov/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-	>=dev-python/coverage-6.4.4-r1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/fields[${PYTHON_USEDEP}]
-		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.0-pytest-xdist-2.5.0.patch
-)
-
-distutils_enable_sphinx docs \
-	dev-python/furo
-distutils_enable_tests pytest
-
-python_test() {
-	# NB: disabling all plugins speeds tests up a lot
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_cov.plugin,xdist.plugin,xdist.looponfail
-
-	local src=$(
-		"${EPYTHON}" -c "import coverage as m; print(*m.__path__)" || die
-	)
-	# TODO: why do we need to do that?!
-	# https://github.com/pytest-dev/pytest-cov/issues/517
-	ln -s "${src}" \
-		"${BUILD_DIR}/install$(python_get_sitedir)/coverage" || die
-
-	nonfatal epytest -n "$(makeopts_jobs)" --dist=worksteal
-	local ret=${?}
-
-	rm "${BUILD_DIR}/install$(python_get_sitedir)/coverage" || die
-
-	[[ ${ret} -ne 0 ]] && die "epytest failed on ${EPYTHON}"
-}
diff --git a/dev-python/pytest-cov/pytest-cov-6.0.0.ebuild b/dev-python/pytest-cov/pytest-cov-6.0.0.ebuild
index 7a0c80e7d268..08e54acc955d 100644
--- a/dev-python/pytest-cov/pytest-cov-6.0.0.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-6.0.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
 
-inherit distutils-r1 multiprocessing pypi
+inherit distutils-r1 pypi
 
 DESCRIPTION="pytest plugin for coverage reporting"
 HOMEPAGE="
@@ -17,28 +17,26 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
 	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
 	>=dev-python/coverage-6.4.4-r1[${PYTHON_USEDEP}]
 "
+# NB: xdist is also used directly in the test suite
 BDEPEND="
 	test? (
-		dev-python/virtualenv[${PYTHON_USEDEP}]
 		dev-python/fields[${PYTHON_USEDEP}]
 		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.0-pytest-xdist-2.5.0.patch
-)
-
 distutils_enable_sphinx docs \
 	dev-python/furo
+EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
 python_test() {
@@ -46,18 +44,14 @@ python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	local -x PYTEST_PLUGINS=pytest_cov.plugin,xdist.plugin,xdist.looponfail
 
-	local src=$(
-		"${EPYTHON}" -c "import coverage as m; print(*m.__path__)" || die
-	)
-	# TODO: why do we need to do that?!
 	# https://github.com/pytest-dev/pytest-cov/issues/517
-	ln -s "${src}" \
-		"${BUILD_DIR}/install$(python_get_sitedir)/coverage" || die
-
-	nonfatal epytest -n "$(makeopts_jobs)" --dist=worksteal
-	local ret=${?}
-
-	rm "${BUILD_DIR}/install$(python_get_sitedir)/coverage" || die
+	local -x PYTHONPATH=$(python_get_sitedir):${PYTHONPATH}
+	local EPYTEST_DESELECT=(
+		# this one's broken by the PYTHONPATH hack
+		# the alternative is to symlink coverage and pytest into venv,
+		# but that's ugly and likely to break again in the future
+		tests/test_pytest_cov.py::test_central_subprocess_change_cwd_with_pythonpath
+	)
 
-	[[ ${ret} -ne 0 ]] && die "epytest failed on ${EPYTHON}"
+	epytest
 }