gentoo resync : 25.08.2020

7 files changed, 78 insertions, 91 deletions

diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index fdffc20ac54a..0a1577e5ac7a 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,11 +1,9 @@
-AUX pytest-xdist-1.28.0-strip-setuptools-scm.patch 926 BLAKE2B 1943edbd4511b40b137ffbf27b67ef42218dce9c740c7a98e0c203a4688fbe8bc98bd3c15578dfc7c39fb5d4bb0aae7ceb4efa55dd8a633ab3bf3a80e69fbdde SHA512 43e6e52ca5e436b292f966d36c7276ca4d3dbc6f94c58eee014a357f18ce35a3ed8530b69418028f51311a465f4904c4ed52a279c910b1bb8469352238f162dc
 AUX pytest-xdist-1.32.0-timeout.patch 1864 BLAKE2B dcecdd06bc1e41a1206f5bf08cd19b5bbb35fb5bbf8e81aa188a75e43c648c68b052e3eb6e9041d1f92337a271e278cc60d4e9a7cbdaa43c0f155f5425373cdf SHA512 71520b9da47c272799c91f1856979bb087f7dda73bebb38f6288c2c688953853ce474e92608d84dc17316d22cd7cb78027144269662ce4cc6f62b923acf620ba
-DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f7918435c75f8da1694cc7ceb920ac3a7390d84bea93cca558ba26cf3d14a01815374eab9ea03a137a8a9f5dba2f2d4453a8 SHA512 4aae9a6d74e53a29630d0233d0a903d008023e322de726ef7ab7cf4865f428942f96cc65264e19726cb6213264edaa747da2cb6f368989417ba821f2a3f9b654
-DIST pytest-xdist-1.28.0.tar.gz 61486 BLAKE2B ef8157079ea890342cd566f327588148fa898a3404e3edcffb60ba8ba37d9473b4c2a47fc737f7bb074042c6aadd737ac51f348ce79a718eb446036016cd5e23 SHA512 89b8885103a944ae72535de40028db052f76631ade6f969489d3dc3a1a61a3233df6655d0905d9f5253f23740a15aea824b460c680e79c16f275b31cb2abd6ad
-DIST pytest-xdist-1.31.0.tar.gz 66133 BLAKE2B 79fe5f3bcad3421c1c751ffe6e09f0da42d4ff7c0016cb421ffabcab167028ec41ccfb02bbb275564cd74b13ade8d6e79bbb70b34995f3bc9000604a1533df9a SHA512 b7960d20295232b251c8ddcc5a3b9d6e7b761d577ba11c2647b4b4b410ee5c05998cf57fa57208561eb3ea7c4914db1fd446173794589d8c8e8e79ff8e0ad3aa
-DIST pytest-xdist-1.32.0.tar.gz 67733 BLAKE2B da0ce4e43dc8752e4329ddcbc13a5f55f5bc120c13f39bb01916770d2dc1864197fd91f92bc55ba27cd74b0d837ac2d310980874cdf54761339b2cd654dd6e74 SHA512 f159b4653efb4afeff4124df484670d3c672e1014712f948390b25efc53096f8237258c83a5f1a9e688c52b4a756291cb731d37fdfa800707f556550a19cb0e8
-EBUILD pytest-xdist-1.23.2.ebuild 1038 BLAKE2B 1d3b0a9b09b92c4ca54420f8c080a84c975e070e8195243659bde9dd4de01641fbd702ac00b059edd90c430e503b976a8e228457d630dae827298c2b8cc6bbd1 SHA512 c49f37f82f8167652b5a354be76e05be6b6cf378af707ae5a3ff1b1bdd0ed6366c682f09062118443264324faa4eafa3b7f131668eb9180a8708cfd25d92f546
-EBUILD pytest-xdist-1.28.0.ebuild 992 BLAKE2B 1e550a1cb605b0d0df688f89271ea05ceddcd33b8079fe9dfe239cfe66d7c856cc45f81237bca814ad1c44e605b2f111b7fd2e45ed80b5e4a95335ece97b3b90 SHA512 0b894d560dbdfa1deb8f8580d21958af57b1f2107caae0849353202ec622d5c0ab0055f803357c9c11169edf7e85e1914546e0f7e4b82c1d11d5ea1666aee3f4
-EBUILD pytest-xdist-1.31.0.ebuild 951 BLAKE2B f19b0849f99675e4f6b151f5bc2d7364d10f399e7bd14f0200592ba8e1a75ec91a7cd74632140c3ad1f490b32af940bcf6963d4f9aca0b0521075eb050edefb0 SHA512 cd6524fcd8d023928e6d64f8d89828158841463f5fdf528905b88a2aa022609a33553d3721792939bcfcc8e85eb3b281637bc4f494b262229d1b2e092cdd4e50
-EBUILD pytest-xdist-1.32.0.ebuild 1028 BLAKE2B b097cb41d9f2cbb02f85e128b139a93410ad87ebe1712677b9e9578733c4d4a7230ef443f82089df972fe0a98383e4c3fb131f59f74021c6ffd95d9a79123c88 SHA512 e1bc7e10673f5bb8904186bc4893187e12c8a20dd5b06bc4b0b61cb8dcd43ee804912a1b41dd03239b52f3ac3fc110e14b87e97824e72013a62eb90758e20913
+AUX pytest-xdist-1.34.0-pytest4.patch 1839 BLAKE2B 6f16b51b8b8415390d66b5763afe038e035e22f4f5e2db637497284c52a0eb271d4fc2a9585414ca5d3e34354ca84e2f291b10344331cc1c25663d616f34c7d4 SHA512 d25119e0f26b4b9e97764c962c83e43ca5564e27f711374ee1d1932de0917b30671e29c98799f61bd436f6b560abbbf379a24ce79271c5dbc7ed4563ee145b4b
+DIST pytest-xdist-1.33.0.tar.gz 65588 BLAKE2B 096ffa9295ec0ef4d390b714b02a4d126aa33475b55591b91375f2da0c957802e007b990dc2051d5198f223b250a4a7294367c9da8f8969313a61a7e8ef18ebd SHA512 5e5b23e60b546779d4bbcc9b86c004bdb084689ba006c8bb8a7db9be60b6080f04a5bb2b1f5b43a5062b82e35493331d1da699d8a36177307280b06aa23a1367
+DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
+DIST pytest-xdist-2.0.0.tar.gz 65663 BLAKE2B 01f4154ae77c0ca67bef9cc0c36f9e3aea03ea554ba45ababb53647720795eae85e6c884eee6cd14037d566dc7bc46f49496aaaecfaaa31322b045339e6c01e8 SHA512 ad1e22ec6963e16f3f1408f0ed39c2945da8f8d2b332b29c36151bc1245e1b9ab532315d8315c22f93f249a64ab508fd78bccd5390be7315d962dd2382f63e0d
+EBUILD pytest-xdist-1.33.0.ebuild 1056 BLAKE2B 94e4bdef998cbe0fb49237c364223aa761247ebea7970720491113aaa11aaf65b8afa4cf11bae2be7ad6a980bd060bbc18ef0484c2803f67dec76fb192963b28 SHA512 64703fa61cd35fd69970c3574b38fda94fe534ab59949092d5da6551e9093596f00c0a0f896d862077f250eb8e934bc6a74c120c41c33b2a23aa2657abf8fc24
+EBUILD pytest-xdist-1.34.0.ebuild 1087 BLAKE2B 3c34ddabce31ea834e64d0d36343c57e623c6ba5993599db23e4cdbb6548c8aea84e5f2700f2bb05924ca3600d44bc5c93aaee0d4c96ef2463631c503f30760b SHA512 b5fba8ca40bdee2869a879b8309d8cac32cdfe8fabae205e543609299d1e83ca07ae9843a4f8affc3ef628eee394f7b8aebb7ab2eabc34755f121bb908da51fb
+EBUILD pytest-xdist-2.0.0.ebuild 974 BLAKE2B 787263f04153aa40ab2aaaa4387a88cf25eae00d5df9cde0540a5eb852e08413cd49bdfc0806206dc1c606dd2a319a060adea0f614049491d139b3210ed8bcab SHA512 0373a088d378678d4edfc9cff2e1ae2f3531e52c923c691436119af4c9efc87e7e2e445cbd5d2ed462bd00d67004ca492b5714975791879b58950c4c205ac429
 MISC metadata.xml 453 BLAKE2B 9480ffb520fafac8b32ec407fb065a89b67c085c7474032528e6a7489fdb26d288228cb75a502e407d92f0e53283bda58c2632e552d4daf65d37b78d33b3598b SHA512 13ec72148a023c16de4b51f02f8a34f5a29ba26bae56aebd8a89ca7a90f249126f92096d138d41d770eb1053618e58679211f468e3136f594514a936f414b265
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-1.28.0-strip-setuptools-scm.patch b/dev-python/pytest-xdist/files/pytest-xdist-1.28.0-strip-setuptools-scm.patch
deleted file mode 100644
index 8ef0272d2b5b..000000000000
--- a/dev-python/pytest-xdist/files/pytest-xdist-1.28.0-strip-setuptools-scm.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 17abe9a..81422db 100644
---- a/setup.py
-+++ b/setup.py
-@@ -6,9 +6,13 @@ install_requires = ["execnet>=1.1", "pytest>=4.4.0", "pytest-forked", "six"]
- with open("README.rst") as f:
-     long_description = f.read()
- 
-+import os
-+with open("xdist/_version.py", 'wt') as fp:
-+    fp.write('version = "{}"'.format(os.environ['PV']))
-+
- setup(
-     name="pytest-xdist",
--    use_scm_version={"write_to": "xdist/_version.py"},
-+    version=os.environ['PV'],
-     description="pytest xdist plugin for distributed testing"
-     " and loop-on-failing modes",
-     long_description=long_description,
-@@ -24,7 +28,6 @@ setup(
-     zip_safe=False,
-     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
-     install_requires=install_requires,
--    setup_requires=["setuptools_scm"],
-     classifiers=[
-         "Development Status :: 5 - Production/Stable",
-         "Framework :: Pytest",
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch b/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch
new file mode 100644
index 000000000000..8595480c01f0
--- /dev/null
+++ b/dev-python/pytest-xdist/files/pytest-xdist-1.34.0-pytest4.patch
@@ -0,0 +1,50 @@
+From bd4e91d12bf6e20538d9b3acfe69536b3badcde5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 31 Jul 2020 20:13:24 +0200
+Subject: [PATCH 1/3] Fix test_config_initialization condition for pytest<5
+
+Fix test_config_initialization to be correctly skipped on pytest<5,
+by explicitly checking pytest version (idea copied from
+test_looponfail_removed_test).  The current conditions are insufficient
+-- the outer check wrongly assumes pytest>=5 will always be used
+on Python 3 (which is not true if you need the same version to support
+both Python 2 and Python 3), and the inner condition apparently
+wrongly assuming that invocation_params attribute is not present
+in pytest-4.
+---
+ testing/acceptance_test.py | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
+index 7f9a551..29c5d9a 100644
+--- a/testing/acceptance_test.py
++++ b/testing/acceptance_test.py
+@@ -2,6 +2,7 @@ import os
+ import re
+ import sys
+ import textwrap
++from pkg_resources import parse_version
+ 
+ import py
+ import pytest
+@@ -594,15 +595,11 @@ def test_fixture_teardown_failure(testdir):
+ 
+ 
+ @pytest.mark.skipif(
+-    sys.version_info[:2] == (2, 7),
+-    reason="Only available in pytest 5.0+ (Python 3 only)",
++    parse_version(pytest.__version__) < parse_version("5"),
++    reason="Only available in pytest 5.0+",
+ )
+ def test_config_initialization(testdir, monkeypatch, pytestconfig):
+     """Ensure workers and master are initialized consistently. Integration test for #445"""
+-    if not hasattr(pytestconfig, "invocation_params"):
+-        pytest.skip(
+-            "requires pytest >=5.1 (config has no attribute 'invocation_params')"
+-        )
+     testdir.makepyfile(
+         **{
+             "dir_a/test_foo.py": """
+-- 
+2.28.0
+
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
deleted file mode 100644
index 2d3a4cc23b66..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} 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 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-# See #673106 about the pytest-xdist blocker.
-DEPEND="${RDEPEND}
-	!!dev-python/pytest-capturelog
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( !!<dev-python/pytest-xdist-1.22 )
-"
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv testing || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.33.0.ebuild
index 8ff5690847c6..0a7311caa0e4 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.32.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.33.0.ebuild
@@ -14,13 +14,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+# pleaes do not depend on pytest to avoid unnecessary USEDEP enforcement
 RDEPEND="
 	dev-python/execnet[${PYTHON_USEDEP}]
-	>=dev-python/pytest-4.4[${PYTHON_USEDEP}]
 	dev-python/pytest-forked[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
index 6babb2e6cfbf..2cc790bff706 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,13 +14,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+# pleaes do not depend on pytest to avoid unnecessary USEDEP enforcement
 RDEPEND="
 	dev-python/execnet[${PYTHON_USEDEP}]
-	>=dev-python/pytest-4.4[${PYTHON_USEDEP}]
 	dev-python/pytest-forked[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
@@ -30,9 +30,14 @@ BDEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest4.patch
+)
+
 python_test() {
 	distutils_install_for_testing
 	pytest -vv testing || die "Tests failed under ${EPYTHON}"
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.0.0.ebuild
index 26489b96dfa9..454164201554 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.0.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -13,25 +14,23 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
+# please do not depend on pytest to avoid unnecessary USEDEP enforcement
 RDEPEND="
 	dev-python/execnet[${PYTHON_USEDEP}]
-	>=dev-python/pytest-4.4[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
 	dev-python/pytest-forked[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 "
 
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/filelock[${PYTHON_USEDEP}] )
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.28.0-strip-setuptools-scm.patch"
-)
+distutils_enable_tests pytest
 
 python_test() {
 	distutils_install_for_testing