gentoo resync : 13.06.2020

4 files changed, 161 insertions, 2 deletions

diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 64369951284a..b992ee775fab 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -3,13 +3,17 @@ AUX pytest-4.6.10-timeout.patch 1297 BLAKE2B 3a5b4005b1aff72b17a366283e692bca19e
 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.10.tar.gz 951516 BLAKE2B f87d00c3d69990f39369ec6af8c4b88d8b7da9bbdc9fcb324243ea2164a501e1b23d1c2a7f92049b58786fc2f1006673a5b5348e2367a8ca476650623c1f67ed SHA512 73668967f6568654cdf92e260ada79d9685fcfc30967499709caeb12527e39a9e886f057c4c73e8a39125c0fbfcd674d905b7023402ce0ab9e836aa77d3888cb
+DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3f22e2f3bf853c643c5c8bd38f307018579299b700d90034a826db73a3e569857d6d6f7ac6646ace894b35a39b SHA512 6fddf4944bd9fab83024aa2d338d54aaf3d164bd5c7f634357376f3b0d2dab6a43d784e7fb567236c2d2f029151c5d9e2cb36c22e9b551c2c8823c52a2246e9c
 DIST pytest-4.6.9.tar.gz 956816 BLAKE2B 7eaeaa0d47c17836a35d9cdc97663f8ef65253099b21d60a7ffc3655d8bd93c6b4e33045caa6c8ab9bb8b920b93e596ba86d8eac4ab07b3b7a5989b38312f4fc SHA512 ab45a8662aa798a6ae224ad2cd68e043c605e4830c76cb6c6aca3cfccef232c024cbbb6c48c9bae19148099c339abfef3270a2208cc7e5c37a10b34b0aa6ba79
 DIST pytest-5.4.1.tar.gz 1017924 BLAKE2B 2892b06655384c8453963e8444e7c1659f4ce60410afe6d01c480da4858628f6c8fd8774131c5bfaca3b3baf9936e3e4d607788b390d37f7aee90cb39c4ba15c SHA512 50d94158817561316cfb4c6ad4481858a76cfe44ba964cc7a3bb81d3701eb621ca5cd46c4be24644134417d8bf7e7771f4b3a30af71fde5ea9705c3241fa2878
 DIST pytest-5.4.2.tar.gz 1020640 BLAKE2B e10ce7a2dbc1ff42ffbe02c3a9f72b4c829c5cc80ba9a50ae015d181c03916a807ee2b13d40e0d7590844f67f8b68e926c770d298fd839c3cf24d9daa4b4e1e7 SHA512 c92ffa613a02cee2580d690c24b76f16957082b138cf7c51d277b0fb5098fab2272ab73295e5e368cbd908026130a9185a35f8792054e36b7ade0a05f7f3f192
+DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
 EBUILD pytest-3.10.1.ebuild 2366 BLAKE2B 7f7617f2d4bb90edbd0350297870c823f7525e2f18d984fe9a12cd8bbcd4dcce461e3a7f43c1d5ba8ecbb90d7606f76f0ecf336d7a0933baa6cff22417aa4efe SHA512 1104eea0003f68645660eebc1b3ca8736cea46f99de40637955169168c1efe07ca90ef8967d31bcb470f5e1aa831ed0b572b9156671bc718dc1da8d18c96a8cb
 EBUILD pytest-4.5.0.ebuild 2082 BLAKE2B d2e9edae4f7751ccdbccd6b3c98e77a67aa3aacc77eaec413fd05d1cb65eb6e48c52a181993d8e0cb83ce9d26d23ce4590d398ecddb2c6a72a15ec4d57538ffc SHA512 41dc00468a3b5f16275ced0ff703e9fe53a618a82b8da9e11a0a4a1dc5dc82c1eb666679498e1df1c7ff67540f786e8f419570a93be0d361fbf44678b7dd527b
 EBUILD pytest-4.6.10.ebuild 2474 BLAKE2B 91ab3acadcc8833e7e9b5414d20e2a55ed054563a8d4642b60065d27e6521e9817ef7d487b96ad4a88cc1ba6c9b2a58b83257a43f731b710555fa857f3ad6a80 SHA512 653f26ab3dab287537285a382b7b35b1e2fcc3383a7b06ba362bf84aaf104083ae047d0563f858470f459c804052081c04c1eadfdbd2a9023ee19927ae79909f
+EBUILD pytest-4.6.11.ebuild 2484 BLAKE2B 5dd643088a64cef2db86b30b6b95cfcf8e9dcb5f01c0dc0eeda05a318c9992f80465a86dac10c6d95578b5312f40c1e2e2354692f2a8a4d6c1c4c37ee8bc4594 SHA512 0c22856acd593c4f1dbba474a3ce62abba9f3195f4fe961b326d4b5e8c7a6fb518d1bd26924d0eef76f96fb09944458217c223a47215952979d6a1f43a1b5b4a
 EBUILD pytest-4.6.9.ebuild 2436 BLAKE2B f4bdbba1e7731e8dbfe4294acd1fc9e72d498bdb13c9cfa57c17da5f9d3aa0089caff3e32b6d68b5b66f4b48bd50f4d9310eeedb8502c50fff189ed2edc8c8bc SHA512 b4ead0e0d0d88175ee79b11af0f7e94790e0d82931defd425c71e138fec6008e6d244fa311e86549e11cc5a02c8a3df8ee9f55565a42f26855021c64f3561059
 EBUILD pytest-5.4.1.ebuild 1641 BLAKE2B 7e4fbe80e3ad011c67d7260bdef6044d5aa852bce7f4ebee0553c3699919ec69fe9da867cd000041b2cdca7443607c3adaf550e4ee5031cb339541bc56fe1b65 SHA512 c9c0eb717a245e038900b63f8db6929045686cc43df3aef51cd0d134f9e9840b05896ce5f926625eefcadaf336dca0ff7252c9143370e1e4962e3e87717f5f42
-EBUILD pytest-5.4.2.ebuild 1935 BLAKE2B 8c63fbdc020eb76aa3164955d716ad78e20b90d840d224f15453ba7ce9f5d6de3b3ae8541969fc89f12ddef231b12b08bed1a82f27d5020f161c3f0a46151cb7 SHA512 59b5bc63121e3c2280a0684a06ea3a594adccfdd2e9532433838f1619dbedd000fb4498407c231110d2ae8365dd9706f2860ff3d4450b1c8eb9ea06fd65b7440
+EBUILD pytest-5.4.2.ebuild 1938 BLAKE2B 1cae7fb13190416aae69261e71f4c160d56cc92445a1145a2fe2d0c8c9895bd20ea616eadd66fb198faece158c0062d65feebd44ebf7d5971647228079f146a9 SHA512 a0ad4afcbec3cb06460e01db127575b3a20429619acf50e1e567e13a25c60348b70ba2c6bd2726a8c2b23b366b43d7b189e7dc6ff3a49dad8e1d5f5988e399f2
+EBUILD pytest-5.4.3.ebuild 1942 BLAKE2B c916fc49800604c6f732dd9ab8a3931da2c9f4a37e7095bec502fee038c8bb69c3486ceebeffa72f4824f0ae08c6aba7329367ced5e1615ccdfc30f61f45585b SHA512 93ca726ac64abb5dcea47f64b725c2d42b36c18eb0968224bc359ab725ce27f250ba7d69853cb09e36d2df149b191d03c1322e46722e9f666d9237647e776f50
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-4.6.11.ebuild b/dev-python/pytest/pytest-4.6.11.ebuild
new file mode 100644
index 000000000000..f7a45485dc91
--- /dev/null
+++ b/dev-python/pytest/pytest-4.6.11.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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}]
+		dev-python/funcsigs[${PYTHON_USEDEP}]
+	' -2)
+	>=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}]"
+
+# flake cause a number of tests to fail
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+		!!dev-python/pytest-aiohttp
+		!!dev-python/pytest-asyncio
+		!!dev-python/pytest-django
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+	)"
+
+PATCHES=(
+	"${FILESDIR}/pytest-4.5.0-strip-setuptools_scm.patch"
+	"${FILESDIR}/pytest-4.6.10-timeout.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() {
+	distutils_install_for_testing
+
+	# 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.4.2.ebuild b/dev-python/pytest/pytest-5.4.2.ebuild
index 7ea70529f1b1..db2b97ff63b1 100644
--- a/dev-python/pytest/pytest-5.4.2.ebuild
+++ b/dev-python/pytest/pytest-5.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-5.4.3.ebuild b/dev-python/pytest/pytest-5.4.3.ebuild
new file mode 100644
index 000000000000..3453fa72eca5
--- /dev/null
+++ b/dev-python/pytest/pytest-5.4.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="https://pytest.org/"
+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"
+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}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=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}]"
+
+# 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/pygments[${PYTHON_USEDEP}]
+		dev-python/requests[${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"
+
+	# fragile to warnings from other packages (setuptools)
+	# little value for us to run it
+	sed -i -e 's:test_no_warnings:_&:' \
+		testing/test_meta.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	"${EPYTHON}" -m pytest -vv --lsof -rfsxX \
+		|| die "tests failed with ${EPYTHON}"
+}