gentoo resync : 28.04.2019

7 files changed, 46 insertions, 135 deletions

diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 1043ced51c7c..8a1cde6ca616 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,8 +1,7 @@
 AUX fix-for-deprecation-warnings.patch 678 BLAKE2B cbf75e452f1cb5225d23d29c8105fc46c03d66b65ad359e84d63780fdff36342b50a5465c4ebcfe1a94d277301de49e5f4822856411e54d939d85d7043a1f094 SHA512 3f20f6ef0514d676259e6bfd5c10c1877c4237a4a87161352adeda355dac693a6a43b8be3b29848feca433a9ead3e96967d8e255b62e3b60d816127eb17c4cae
+AUX pytest-cov-2.6.1-disable-broken-tests.patch 870 BLAKE2B 8e9c6c236765922ec0758402491718817401ab931dea5c888de1457a6d07b5053417ddb881bc186389ad612afe1798ab803dabf6551bffa3125f1db2ff8483a2 SHA512 4a1a6625824990499fffa76cd2c57fbe7050bf2d4305c81ca862cab2d5aad6ac094bf3597b15d928ff0c5f9f7671b209a394d538dbe50ecc3efc14d72b19137d
 DIST pytest-cov-2.3.1.tar.gz 35378 BLAKE2B 758846db0b06ef9534823d3458ad6211b0cfc14b551a6e1737573a5c1c5bb59c23b26d3448ff8a67d65a4293ce75dd8c79d4916d3d9a7db5021db6b907152230 SHA512 79770beb53fbb43b5d68311c2efd0accbfd890ab6dad299da8c1c0b3d26b54d984807313b1507900cda7004bfb50fedc0bd4341cfcfce47849a4f24fc8184f11
-DIST pytest-cov-2.5.1.tar.gz 36201 BLAKE2B ba07d751c7635ee01262a6f2eeffb27393d58afadb625b220237ff9d014ecdda0f18c0b5fd7bdec66fa4a948f2bb70a715af6dc76664e9c573ad56520c8dee1e SHA512 868131d6ea6dd28deec6d653dec23ceb7d3adccfa2c6bcc0a3126bbb11e924e71f200676461b2202f274ce6e14d1799feb0917e3081817d9e8583271c18a43de
-EBUILD pytest-cov-2.3.1.ebuild 1488 BLAKE2B 8b64bf914227876cce3a0fad5d35be27933957bf0666fbc61f8a1d12fb04d6450c9b026158880b19b816b5c098f5485098dd04de812312d3b6bf798c9ecdec17 SHA512 c699d519d7732630a1816011ec02f8828457dce64be7bc6983a5d5e7a6de77b6e94719155fc19b03c93887c290740f9ac9bbf011d6b52246d0408cfe67cc3b0e
-EBUILD pytest-cov-2.5.1-r1.ebuild 1479 BLAKE2B 2fc222b784d637120b2fd6643202a10478762fa2b34b5d60a2dbfce0b56e2fbbb8e1715dd76495c97ce79e68d23ec54701530f022cacb9e0e6727fafe16f31c0 SHA512 e6494d1110ce8908b95371cda1adb3bb887fd5265f7adb8b0f9e3a234fbd654fae36a793f8d0e274730c4c6be68519d0f571eca2da496fff3ecf5aae9df3f97e
-EBUILD pytest-cov-2.5.1-r2.ebuild 1484 BLAKE2B 4af790131980134ff2ba436b9121989bf84fe1784dfe0b0a87ac0b21b16e3299c77f6fbef049e2c4ac907f2347b64444fdfd93d02bd77c336f01f6f167400331 SHA512 3cf324e7a71d3897deae0d4d1bafad2c9ca31ba9e6bbe26e3efd8d9e00ff61a9ed760306401610a5e5b953774dc0ecc85d6f89c8bfca5e1892551d604d8dbc98
-EBUILD pytest-cov-2.5.1.ebuild 1454 BLAKE2B d1495d046178052686c462a110404302bd2dd3fc8410a19e53962fc6485225bb7dda3eec4f08e02d49183cf63eec2063b839bf809578d4cde0274ffbbf031f54 SHA512 6a3755154542c9a0071a15a3d2dca307fe9a4ab4c24124fb24e0d5a602f9246121ff6a57b703efb48380d02b5a09b5134510d636f1f1df1b5445d32257b703cc
-MISC metadata.xml 460 BLAKE2B acedcc7748c95511d1ebe201052b50e43569250e41f8d08d8eceb3f8c8b10924d64e74f6ff6453896f9fceff2a939f42d21d3013b9a486b007bb922dfd285ac9 SHA512 5600a6e66b683a30d6252699a28fecf727bdbbad6ef40cec0fabb89f5afd3a0cf1e2b8e2b80ffa6cc144ac03f5e7066117d72fc968492bd3b1d6c89a8b035228
+DIST pytest-cov-2.6.1.tar.gz 35307 BLAKE2B 11974ff70ed5609d7db3c4c35f5b528b0ec36b48cfaf06974a090127706e0964841347592ac3f1e086f46800857ee10c05404045b6a4b467ffa278c2ee1e1957 SHA512 2dfd16e013d8bfbe5d14990f419291b651dd11560328a7e59b5449016d51b17f84d4ee3866fda866c3530389d206b1c4c67c84b23f097281c3963ffd19ea8caa
+EBUILD pytest-cov-2.3.1.ebuild 1478 BLAKE2B a769eff365dd54a53bb2b657c6c4753f79d526c551858377ab61622ea4be76862f0e60dabdef28cd6930992e8df0d4754609386f7c88d07003ced8b8bd474a0c SHA512 1d0b0a88a282066db864abf7c8522597158d1c5d000159c8d514976c01b27e8795419ccf0358c08302fb0b64ab3bc2132f847390021e05a327f970abc8577b7e
+EBUILD pytest-cov-2.6.1.ebuild 1438 BLAKE2B 7b5a2d1e56c7282cfbeb5ebee9e9429e599fcf8220da80ac06f2803360aa23aa8b4590a7548e4612e4b8b8cda836f6e017fea7cc67404519505fcd76aea2df28 SHA512 19952fec6a97b088dc973cef19a1395692aee0e5b616ef4cd9e1aef725a8012d5c8e8ba8217bb2ab8435737c178ee6284903bc3a86c98fed0054be1ca2c233cf
+MISC metadata.xml 451 BLAKE2B 61b39473b8b03a8096c5e63b8b59098cf1cb07bd5c5ab875e6d12af03b9113c2e0ecc8d16b395e73ea70378a568efcc3ae18d1970004aca5bb4c8a45bb266c67 SHA512 097e5da22a24c3eb0636095b4385bc7102f45968a489121f296547cd29cf9d416264f44b7b0766bb8206d6364ed40408e016790e755f139728d36954cdf5312c
diff --git a/dev-python/pytest-cov/files/pytest-cov-2.6.1-disable-broken-tests.patch b/dev-python/pytest-cov/files/pytest-cov-2.6.1-disable-broken-tests.patch
new file mode 100644
index 000000000000..1d8e36b451b2
--- /dev/null
+++ b/dev-python/pytest-cov/files/pytest-cov-2.6.1-disable-broken-tests.patch
@@ -0,0 +1,22 @@
+diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
+index 2896ac9..5f753e8 100644
+--- a/tests/test_pytest_cov.py
++++ b/tests/test_pytest_cov.py
+@@ -699,7 +699,7 @@ parallel = true
+     assert result.ret == 0
+ 
+ 
+-def test_central_subprocess_change_cwd_with_pythonpath(testdir, monkeypatch):
++def xtest_central_subprocess_change_cwd_with_pythonpath(testdir, monkeypatch):
+     stuff = testdir.mkdir('stuff')
+     parent_script = stuff.join('parent_script.py')
+     parent_script.write(SCRIPT_PARENT_CHANGE_CWD_IMPORT_CHILD)
+@@ -829,7 +829,7 @@ def test_invalid_coverage_source(testdir):
+ 
+ 
+ @pytest.mark.skipif("'dev' in pytest.__version__")
+-def test_dist_missing_data(testdir):
++def xtest_dist_missing_data(testdir):
+     venv_path = os.path.join(str(testdir.tmpdir), 'venv')
+     virtualenv.create_environment(venv_path)
+     if sys.platform == 'win32':
diff --git a/dev-python/pytest-cov/metadata.xml b/dev-python/pytest-cov/metadata.xml
index 14ce7f071662..8dbf3c52128a 100644
--- a/dev-python/pytest-cov/metadata.xml
+++ b/dev-python/pytest-cov/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
   </maintainer>
   <upstream>
     <remote-id type="pypi">pytest-cov</remote-id>
diff --git a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
index f57ab12f3964..14976f71122d 100644
--- a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
 
 inherit distutils-r1
 
@@ -35,7 +35,7 @@ DEPEND="
 			>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
 			dev-python/pytest-cache[${PYTHON_USEDEP}]
 		)
-		=dev-python/pytest-xdist-1.15.0[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
deleted file mode 100644
index e0c277e0bfcd..000000000000
--- a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/fields[${PYTHON_USEDEP}]
-		dev-python/process-tests[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
-			dev-python/pytest-cache[${PYTHON_USEDEP}]
-		)
-		=dev-python/pytest-xdist-1.15.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && sphinx-build -b html docs _build/html
-}
-
-python_test() {
-	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
-		PYTEST_PLUGINS=${PN/-/_} \
-		py.test -v -v -x || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( _build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
deleted file mode 100644
index d64465eebd71..000000000000
--- a/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/process-tests[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
-			dev-python/pytest-cache[${PYTHON_USEDEP}]
-		)
-		=dev-python/pytest-xdist-1.15.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && sphinx-build -b html docs _build/html
-}
-
-python_test() {
-	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
-		PYTEST_PLUGINS=${PN/-/_} \
-		py.test -v -v -x || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( _build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1-r2.ebuild b/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild
index ee73b89744d9..7af2f09e3383 100644
--- a/dev-python/pytest-cov/pytest-cov-2.5.1-r2.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -18,9 +18,8 @@ IUSE="doc test"
 
 RDEPEND="
 	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
@@ -32,22 +31,24 @@ DEPEND="
 		dev-python/virtualenv[${PYTHON_USEDEP}]
 		dev-python/fields[${PYTHON_USEDEP}]
 		dev-python/process-tests[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
-			dev-python/pytest-cache[${PYTHON_USEDEP}]
-		)
-		>=dev-python/pytest-xdist-1.15.0[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	)
 "
 
+PATCHES=(
+	# Bug 597708
+	"${FILESDIR}/${PN}-2.6.1-disable-broken-tests.patch"
+)
+
 python_compile_all() {
 	use doc && sphinx-build -b html docs _build/html
 }
 
 python_test() {
-	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
+	distutils_install_for_testing
+	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}" \
 		PYTEST_PLUGINS=${PN/-/_} \
-		py.test -v -v -x || die "Tests failed under ${EPYTHON}"
+		pytest -vv || die "Tests failed under ${EPYTHON}"
 }
 
 python_install_all() {