gentoo resync : 15.12.2019

7 files changed, 159 insertions, 66 deletions

diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 4abadde7ad0a..ea7ae9e8f099 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,11 +1,14 @@
 AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08
-AUX pytest-5.0.1-test_xfail_rmdir.patch 1589 BLAKE2B 8c4ed570175fa3b2461fd5dde31e6618a0a2af7cef19529995a8f537b0bda1acbabf949761cf36db5f8d1fbf04cf7ec3bc6c40f249d8f158540d85ad2388c768 SHA512 fdf17a7c2d4bde5b1cfa01224cb464c3cae469dd1ab7fcd4158a57525127bc51ea19b777b01b4726a6190ecbde74e47d38cdcdd0fbfba31b4e6c76bac13009ce
 DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
 DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc
 DIST pytest-4.6.6.tar.gz 954899 BLAKE2B d3d76ec1fff18d343cc799f1acd0889489f303cdba72747881dfab8656599bc1865f01b5ad2754f0d05bda04aca4d7edf8c2071f2257fdf41506308d1bc0f623 SHA512 c5b6c21c352787eadce06be7529ecb6f6fd5f5eb193ec29e5a4cfff3d7e305f50c6f07aeac15bddce007d88077a35a8f59633111815321792ed3d9fa1011b684
-DIST pytest-5.0.1.tar.gz 949744 BLAKE2B c949f0fb6bc0d1430ec7c780537f8aee8ca1ebea5f89035d882434236c6af7d431a610774dbafa93552406e38852627a9f949a6f9198a792de9371efadb4f6ff SHA512 92f5feb263a8708ef6cb8f4565688620b6bfeaef23536cfd24b9bc09515e37fdecd7fa8bcaeeb0775c0be1d8e9dcbd9a56e52f97fb13dc98116efc0056f870db
+DIST pytest-4.6.7.tar.gz 955616 BLAKE2B eb2276e715bab176fe4e497a51779d82b7146704749b33ebdc9dc07a0fcad144252553280a7bbbbcf23c6862fb74f1faf75de42ed0f5295ecd287fc10ac287a0 SHA512 d284cef48c0e39c901d23cd63949cc1d8b8cf01c3039fd2bfd99275bf6a45532c955e1176d556a7e2198e6206830e6dc4f4fb22c143ff7e08de6ffbfb6079fd1
+DIST pytest-5.3.0.tar.gz 992537 BLAKE2B 4386d1623bdc168313a75847dfa33413ab1b6a4de9380c67ae866a579dbeb62d8cd18da899bf0476827d6e4a76ddfc5fee7a2fdc652eff0c8848c0bd96045c47 SHA512 285d0b4f6b87b141d6d5dac368dc46eb80dd025d7ed4ad0db937fcc76efc1f8cf251ca9b0786ab1bdadd89c07ad8ddd74f2b3496f97326e9d7fccfd004b98aff
+DIST pytest-5.3.1.tar.gz 994584 BLAKE2B 3831902684d935389b4684af1279a5834edbbe846f8fdb1ce1e64990ab65d6fe8ed3cf5daa446cd20daafe9eedc6f57e01b16d74a55631ab746750a73056640d SHA512 e949a516c064a7050a0ad15356cc0bf25e4840e830f03e1925530c8a2dd9903d7632e55535894474422ba86fd9ed7a397c483d98dad297990b7b49456147189e
 EBUILD pytest-3.10.1.ebuild 2457 BLAKE2B 7da16cfafd27b53e17aba28a0d5126b1dd9881f2d645edd4142934bd5b6c41b1e478d5fd0fea875321c9663e066973f41838abff744dc1765146c327b68cf821 SHA512 5614e616273ba510196fb6e1c2bd64ff4bb2e4d201469aea34502edb643aec98fc0e8e355a9cfd3c8a1922c8763ae775758c77bf15ad1fa9634dec25aa65f298
-EBUILD pytest-4.5.0.ebuild 2100 BLAKE2B b8f50b6ac86f018ee28113caeb0c31ac4e37ee3b47c5664de71dde01cd21749ef58bddee5ee83e10627e8da72668e963766670be5965c013f03abafdeb2e76f7 SHA512 b12faac5af65e60c291e592a42e1674d8a0864f31bca65a5c91ed5b6b7d922eac8d90d32c70f2098ca7406725218ea7d6c4261ed70a21d3867168cb787abc6be
-EBUILD pytest-4.6.6.ebuild 2822 BLAKE2B fe122484da8a47115f6e19878e9b609c1d45b0378101bc3ba2741ceca1167282ba7e828e597e8ce6d352ed43c7f43fec512ecae17cc5fcb525ae5337cf8ff180 SHA512 de6ea2ffb70a944382f9b29dadb6270a6b038ac1f1f9a1c1c5d7f82c9bedfcf2de9930d65312bd8eaaf9c69a6938d5c0141bfe4bc89bdcbdc7cf7ca60b5011e5
-EBUILD pytest-5.0.1.ebuild 1950 BLAKE2B 53ee335933f9127559b3d04bb738670235adc78fb5cdda0e64aa43e27ea15def07d72f5fec072606724333efb73613650c15d020ff11e2ce8d0235cb4194cfbb SHA512 b5b4c6ff13ae8c5991be28819002be5a12ba12c1c20bec26c737a64170bf726b06e1ce0e3da33a7b706c4c78a6539dbe32ee90f4015bec91d85b33ce63246b08
+EBUILD pytest-4.5.0.ebuild 2104 BLAKE2B a29a19fc2d165cb9d267512ea66e045c251a6efa124c1885245818491139554464bc90b7265b8dd727375a5ceeff7cf7ccb06da698c9833701979e6708873954 SHA512 45ffd24a3f84046df4159b1b148725b44a9bec95affd26a2dc4386ffe69420f3ac5818d7cc435f1781f1147777a5403686380fed126b8e8fcd54db894a8094fe
+EBUILD pytest-4.6.6.ebuild 2287 BLAKE2B 2f83b06ed1a50390c5c98374d3059aeb071986c43cdc5b6f485fb2f3a12635a9c94d02ef706fbec944b5e645f6cf8e95795b7c3aa9dbea95c81fbecca8408ee2 SHA512 a7313c7476ebc5931f76001f9eaf7b532fd726c370e85e1209041543a79ef39d4af29fb637809a903730f99b50386db28ee45e8a8c735f312d3909453897074e
+EBUILD pytest-4.6.7.ebuild 2287 BLAKE2B 2f83b06ed1a50390c5c98374d3059aeb071986c43cdc5b6f485fb2f3a12635a9c94d02ef706fbec944b5e645f6cf8e95795b7c3aa9dbea95c81fbecca8408ee2 SHA512 a7313c7476ebc5931f76001f9eaf7b532fd726c370e85e1209041543a79ef39d4af29fb637809a903730f99b50386db28ee45e8a8c735f312d3909453897074e
+EBUILD pytest-5.3.0.ebuild 1888 BLAKE2B 03cb4634216a6d58295741b3fa6ac76a27386d18209ed89d8cacf0e7dafb840bbc918bf566ac080f4d736a8f277ed9ea026ccb737cae4194f72d6c4714223e64 SHA512 d5ccf8e993730b77d3f343c03b702214a10dbff7b7bcce32d0c7343eb1bc85a403f7007dccf9250888f58c245c277b154c7a5b77e0174a9541c4b38724e47299
+EBUILD pytest-5.3.1.ebuild 1888 BLAKE2B 03cb4634216a6d58295741b3fa6ac76a27386d18209ed89d8cacf0e7dafb840bbc918bf566ac080f4d736a8f277ed9ea026ccb737cae4194f72d6c4714223e64 SHA512 d5ccf8e993730b77d3f343c03b702214a10dbff7b7bcce32d0c7343eb1bc85a403f7007dccf9250888f58c245c277b154c7a5b77e0174a9541c4b38724e47299
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/files/pytest-5.0.1-test_xfail_rmdir.patch b/dev-python/pytest/files/pytest-5.0.1-test_xfail_rmdir.patch
deleted file mode 100644
index 5c6154cd92c0..000000000000
--- a/dev-python/pytest/files/pytest-5.0.1-test_xfail_rmdir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ab39502c98f40c03a2956dcf6c6b9daf5ee41a63 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Fri, 26 Jul 2019 02:23:14 +0200
-Subject: [PATCH] In test_xfail_handling, only remove __pycache__ if it exists
-
-Previously, the test failed when the directory was not present,
-which could have been caused for example by invoking the tests
-with PYTHONDONTWRITEBYTECODE=1.
-
-Fixes https://github.com/pytest-dev/pytest/issues/5664
----
- changelog/5664.trivial.rst | 2 ++
- testing/test_stepwise.py   | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
- create mode 100644 changelog/5664.trivial.rst
-
-diff --git a/changelog/5664.trivial.rst b/changelog/5664.trivial.rst
-new file mode 100644
-index 000000000..3928454ef
---- /dev/null
-+++ b/changelog/5664.trivial.rst
-@@ -0,0 +1,2 @@
-+When invoking pytest's own testsuite with ``PYTHONDONTWRITEBYTECODE=1``,
-+the ``test_xfail_handling`` test no longer fails.
-diff --git a/testing/test_stepwise.py b/testing/test_stepwise.py
-index 591d67b6c..f61425b6b 100644
---- a/testing/test_stepwise.py
-+++ b/testing/test_stepwise.py
-@@ -207,7 +207,8 @@ def test_d(): pass
- 
-     # because we are writing to the same file, mtime might not be affected enough to
-     # invalidate the cache, making this next run flaky
--    testdir.tmpdir.join("__pycache__").remove()
-+    if testdir.tmpdir.join("__pycache__").exists():
-+        testdir.tmpdir.join("__pycache__").remove()
-     testdir.makepyfile(contents.format(assert_value="0", strict="True"))
-     result = testdir.runpytest("--sw", "-v")
-     result.stdout.fnmatch_lines(
diff --git a/dev-python/pytest/pytest-4.5.0.ebuild b/dev-python/pytest/pytest-4.5.0.ebuild
index 16bcc98a7257..b0e9367f6a39 100644
--- a/dev-python/pytest/pytest-4.5.0.ebuild
+++ b/dev-python/pytest/pytest-4.5.0.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-4.6.6.ebuild b/dev-python/pytest/pytest-4.6.6.ebuild
index 9467c349be60..4f85c1855b6c 100644
--- a/dev-python/pytest/pytest-4.6.6.ebuild
+++ b/dev-python/pytest/pytest-4.6.6.ebuild
@@ -37,22 +37,18 @@ RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
 	virtual/python-funcsigs[${PYTHON_USEDEP}]"
 
-# Temporary hack to avoid py38 keywording hell.  Please remove when
-# the test deps all have py38.  Also pytest's test pass with py38,
-# so you need to hack them all in locally before bumping and test.
-TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3})
 # flake cause a number of tests to fail
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
-		dev-python/argcomplete[${TEST_USEDEP}]
-		>=dev-python/hypothesis-3.56[${TEST_USEDEP}]
-		dev-python/nose[${TEST_USEDEP}]
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-		dev-python/pexpect[${TEST_USEDEP}]
-		dev-python/pytest-xdist[${TEST_USEDEP}]
-		dev-python/requests[${TEST_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 		!!dev-python/flaky
 	)"
 
@@ -71,15 +67,6 @@ python_prepare_all() {
 }
 
 python_test() {
-	if [[ ${EPYTHON} == python3.8 ]]; then
-		if [[ ${PV} != 4.6.6 ]]; then
-			eerror "Please disable py38 hacks and test locally, then update this."
-			die "Python 3.8 support untested for ${PV}"
-		fi
-		einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps"
-		return
-	fi
-
 	# In v4.1.1, pytest started being picky about its own verbosity options.
 	# running pytest on itself with -vv made 3 tests fail. This is why we don't
 	# have it below.
diff --git a/dev-python/pytest/pytest-4.6.7.ebuild b/dev-python/pytest/pytest-4.6.7.ebuild
new file mode 100644
index 000000000000..4f85c1855b6c
--- /dev/null
+++ b/dev-python/pytest/pytest-4.6.7.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' \
+		-2 python3_{5,6,7} pypy3)
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2 python3_5)
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+
+# flake cause a number of tests to fail
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.0-strip-setuptools_scm.patch"
+)
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# In v4.1.1, pytest started being picky about its own verbosity options.
+	# running pytest on itself with -vv made 3 tests fail. This is why we don't
+	# have it below.
+	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pytest/pytest-5.0.1.ebuild b/dev-python/pytest/pytest-5.3.0.ebuild
index 15641dad00a6..9795396ca686 100644
--- a/dev-python/pytest/pytest-5.0.1.ebuild
+++ b/dev-python/pytest/pytest-5.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 
 inherit distutils-r1
 
@@ -23,7 +23,6 @@ PY_VER="1.5.0"
 # pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
 # support, which only came in py3.6.
 RDEPEND="
-	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
 	dev-python/importlib_metadata[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
@@ -44,12 +43,12 @@ DEPEND="${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		>=dev-python/setuptools-40[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
 		!!dev-python/flaky
 	)"
 
 PATCHES=(
 	"${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch
-	"${FILESDIR}/${PN}"-5.0.1-test_xfail_rmdir.patch
 )
 
 python_prepare_all() {
diff --git a/dev-python/pytest/pytest-5.3.1.ebuild b/dev-python/pytest/pytest-5.3.1.ebuild
new file mode 100644
index 000000000000..9795396ca686
--- /dev/null
+++ b/dev-python/pytest/pytest-5.3.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_5 )
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+
+# flake cause a number of tests to fail
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-40[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch
+)
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py -vv --lsof -rfsxX \
+		|| die "tests failed with ${EPYTHON}"
+}