gentoo resync : 18.11.2019

5 files changed, 96 insertions, 3 deletions

diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index ef8d04ba5be4..4abadde7ad0a 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,8 +2,10 @@ AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a
 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
-EBUILD pytest-3.10.1.ebuild 2430 BLAKE2B 09a0bed17f8118487513408af620c233bdd3b7bc5f8ffb4b5b66becadcc4666393c9bb8783dab942ceeb5de4920a6f22aa2eb91d64f9e5fafa41422df298f75f SHA512 9c11e625e4526cf42bcc55a3ebd9ec1f9066d531ed4fff515733c983e379f32df7854d891a55fd5578276ca102b964ac1647e4f5f9c913a46cb2f21d677d5362
-EBUILD pytest-4.5.0.ebuild 2073 BLAKE2B 22c26d78b8e79da4bf2c63e76278257013a8d99a08d8cdeb7df0ec3af8c38a91451eb2052b736d2ed38eaff3e366839963e74989f8ca559bcb846d6e09bffaec SHA512 cf77ec627ad993bf2cb2cc4f1ffd3a6e1f80cb0e7376071793b1682746bb01dd1aa4a7c2106826cfbabb42702c36c39acca6fa2389bce4cde880004f407acd03
-EBUILD pytest-5.0.1.ebuild 1923 BLAKE2B ad6e07b32be669d7225fcb1c9d396c01a601130cb8e2b6a5f06485ee0a1778ee4580ef3d03f864561b99fd2eb91c9421acb3dae426f32a12f9c7acc8af36c4f0 SHA512 5bfb419b68015969f62ccce3c4579d4175ae1937228741dbf1c2a97f3e1828870333446623ec6e3c42cd57a049b5386539ab7479584e2e9030276309098477f2
+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
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild
index 81d0bec926ba..551cebba719d 100644
--- a/dev-python/pytest/pytest-3.10.1.ebuild
+++ b/dev-python/pytest/pytest-3.10.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # When bumping, please check setup.py for the proper py version
 PY_VER="1.5.0"
diff --git a/dev-python/pytest/pytest-4.5.0.ebuild b/dev-python/pytest/pytest-4.5.0.ebuild
index fbee5f5f5373..16bcc98a7257 100644
--- a/dev-python/pytest/pytest-4.5.0.ebuild
+++ b/dev-python/pytest/pytest-4.5.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # When bumping, please check setup.py for the proper py version
 PY_VER="1.5.0"
diff --git a/dev-python/pytest/pytest-4.6.6.ebuild b/dev-python/pytest/pytest-4.6.6.ebuild
new file mode 100644
index 000000000000..9467c349be60
--- /dev/null
+++ b/dev-python/pytest/pytest-4.6.6.ebuild
@@ -0,0 +1,88 @@
+# 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}]"
+
+# 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}]
+		$(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/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() {
+	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.
+	"${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.0.1.ebuild
index b124d68a3a41..15641dad00a6 100644
--- a/dev-python/pytest/pytest-5.0.1.ebuild
+++ b/dev-python/pytest/pytest-5.0.1.ebuild
@@ -15,6 +15,7 @@ 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"