gentoo resync : 21.07.2018

4 files changed, 121 insertions, 1 deletions

diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index cdf778329c96..d943eedb105c 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,10 +1,13 @@
 AUX pytest-3.4.2-pypy-syntaxerror-offset.patch 996 BLAKE2B ff6d362d20f6432f73956e1aee4c2bc596e3d8e3347da3624dfd3cbfdd1eabd8872058737e8f9b558f3570878756c7b87a65514956b1e81235c2727e8ff2fc63 SHA512 4a28ddc07389aac79e46528e85229aba126a89c27b7bec73b406766be49f5c8be9bdc2cb3158bfb475b4d6371e2f33960e1ed154e3b9eda15aeb8b151f3d2148
+AUX pytest-3.6.3-pypy-syntaxerror-offset.patch 1055 BLAKE2B 8a92e1300052ed7f178252489d4b687d9d58d5fa9067a1f17a20ddbd698843a5614e7dd729670920a447e189b0e40ed2ae26fd13ad7d9cfebc59889c8cc50d87 SHA512 fa2600e320a74eca59004953aea0ac7607e6b7fcbcb702a5ac709dfcf73d036f47c5a79b01e56061ed6776ccaddd7a261162848218969fd1b462c5e1dd615ad3
 DIST pytest-3.0.3.tar.gz 731934 BLAKE2B 7fb57d75bd54eb8a31d9701fdf739119715c475eaaacae3cd038057c1d2bf43fa86ccdc45b3c84962708ef606976ab39ad41e0c3690c8b5f4c04d870579a384e SHA512 ec0b4a5f0d6673a339c5a70b402c004c23db7001005454329eeaea15d890f53b8f2740f6c6254499d0f915b9058bfdfa535d9f22847bb382a060d65204fce4af
 DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
 DIST pytest-3.4.1.tar.gz 812928 BLAKE2B 27b25fcc5a268b1c92188c01bf16bf1eb4b8ced7d1a3c8095350ec55b1f1845a5d54bd6bd169142ca0d327f2f8d193774643174a356dd95fa07b3195bc1e8713 SHA512 75f728840cde6512619a03ce75fd0b04cb9d57a99f381366a0f9c10ffa3210448e7e85505357bfa9bfb0cca11cdedda2c0e091e5473ed82707a2597f234e659a
 DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b
+DIST pytest-3.6.3.tar.gz 830949 BLAKE2B 4c0df5d157b8bb0ac6261a793aac2a8074c869b1a7cbda3eda600c79648b3722eaf2a57514c1fece60e0aac324b8ed09e8e889dda268619204e9e1f1637e1c9b SHA512 e18d8e972cb1b05b037b9441eea5981ce036d8e2c2bab80f6e50f283df9bd08740296133990424cf78449f6d3d2fbd1d59709770aa972af99fe061583f2d79a7
 EBUILD pytest-3.0.3.ebuild 1966 BLAKE2B 50b123408a85c5b283fe1653444472fd467272d99dc944bdf876556fe5e9aa1208e32efbc119cc95ca834bb66a50f195199efd4d04054cf3cc98530eccda710c SHA512 2d6713c361334f2af886827a0918f574512e885fe77cc5a4595ca47d31b37d32f5768989a6bb5447666c8850ca15bca73e7641414d724bb9512d70abb5ea0eba
 EBUILD pytest-3.2.2.ebuild 2113 BLAKE2B 1789686fa508f9629adc37e7fcd26e8a4426214b6335922927bcd8bb37c336792b564ce505c122a729edfaa53af604e4fd1be31f45c5251f0008e14c8cefb06c SHA512 1384082815df0f30e50881c89d81822575509f1333c2d3713b69ff7e3a9113c1a70fa5220d0e10bae0b5f17d844a14501e59af8c944ca4006dfeb9cd0e8616b1
 EBUILD pytest-3.4.1-r1.ebuild 2297 BLAKE2B 52af333554c85fff95f0bffe2246cd7e88a6446ddbe8dc4829600d1a018da613c4aed06e039fbd54d621ca45a3dcf454d24ae9bbe302d97c6084ea37d6641945 SHA512 5c06bedcf6b6f8df4f6bba8f5aace83a72ff530f1f0368a0a5b76f0380d02c55cf64e8645362c63f7f6efef5d49eefcdfff2423734a62acb23799a9e3c567200
-EBUILD pytest-3.4.2.ebuild 2395 BLAKE2B 4d93a78c6c42ec6bd54ebdd224a75254806df6ad8f8be32b268ba9a83ec2063cfe69b9bccb6b899980ec6a77cbb980852d03a833ef65fb4d5eb8e021d15ca590 SHA512 45857fee572e5016dc90e012ff70df9c749592b4695738c5bca8ad100f70d34bb2f1e2b608af712c2c40d27035fed7edc43cf657f1d8a7b0e0b1103596ac0cff
+EBUILD pytest-3.4.2.ebuild 2509 BLAKE2B 23b2f34e9f2923a0eb143a341f4dff40e88d4ff1bf52cd7637d9354192ebadb58c39050feb00911993f0067d60571598864e5a85644b0adb33cab722594f9ebc SHA512 1958df6b0567c547bf70789836e12929caf3e1f17ac16ebad88aac081dce949888a08efceaba04649feb8098d4373548a5d4de511a8b94d6f50eebbd1d5d7b64
+EBUILD pytest-3.6.3.ebuild 2393 BLAKE2B 1f641e44a4a807a43b46b6669c69ce6959218b6715bd0f8eaf4b7e71b92ad1e08fc297ff2bb4664b830c0c019a880a65209a2f0537cf814983bb26fd475467bf SHA512 f4327b5dde5ee14bf4c693fb760f36a8246b42d54fb229154f63eacdf1fa4157a9dfbf54c8842469d9f269de1375e59687229740dde41fc2c496af223b1c05e9
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch b/dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch
new file mode 100644
index 000000000000..31dd00546761
--- /dev/null
+++ b/dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch
@@ -0,0 +1,29 @@
+https://salsa.debian.org/python-team/modules/pytest/commit/405c05a0827592515de76e23c94de1f7773273e6.patch
+
+(updated by mgorny for 3.6.3 -- upstream quoting changes)
+
+From 405c05a0827592515de76e23c94de1f7773273e6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
+Date: Thu, 10 May 2018 11:42:56 +0200
+Subject: [PATCH] Fix PyPy SyntaxError offset in tests
+
+---
+ testing/code/test_source.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testing/code/test_source.py b/testing/code/test_source.py
+index fcce3fa..22278d8 100644
+--- a/testing/code/test_source.py
++++ b/testing/code/test_source.py
+@@ -117,7 +117,7 @@ def test_source_strip_multiline():
+ def test_syntaxerror_rerepresentation():
+     ex = pytest.raises(SyntaxError, _pytest._code.compile, "xyz xyz")
+     assert ex.value.lineno == 1
+-    assert ex.value.offset in (4, 7)  # XXX pypy/jython versus cpython?
++    assert ex.value.offset in (4, 5, 7)  # XXX pypy/jython versus cpython?
+     assert ex.value.text.strip(), "x x"
+ 
+ 
+-- 
+2.18.0
+
diff --git a/dev-python/pytest/pytest-3.4.2.ebuild b/dev-python/pytest/pytest-3.4.2.ebuild
index 1c215e18c9cd..b7ebb1cbf03f 100644
--- a/dev-python/pytest/pytest-3.4.2.ebuild
+++ b/dev-python/pytest/pytest-3.4.2.ebuild
@@ -30,6 +30,7 @@ COMMON_DEPEND="
 		dev-python/sphinx[${PYTHON_USEDEP}]
 	)"
 
+# flake & pytest-capturelog cause a number of tests to fail
 DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
@@ -38,6 +39,8 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+		!!dev-python/pytest-capturelog
 	)"
 
 RDEPEND="
diff --git a/dev-python/pytest/pytest-3.6.3.ebuild b/dev-python/pytest/pytest-3.6.3.ebuild
new file mode 100644
index 000000000000..51f3d8c2149a
--- /dev/null
+++ b/dev-python/pytest/pytest-3.6.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} 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 ~arm ~x86 ~amd64-fbsd"
+# doc apparently requires sphinxcontrib_trio, not yet packaged
+IUSE="test" # doc
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+COMMON_DEPEND="
+	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.5[${PYTHON_USEDEP}]
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+
+#	doc? (
+#		dev-python/pyyaml[${PYTHON_USEDEP}]
+#		dev-python/sphinx[${PYTHON_USEDEP}]
+#	)"
+
+# flake & pytest-capturelog cause a number of tests to fail
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.22.2[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+		!!dev-python/pytest-capturelog
+	)"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	!<dev-python/logilab-common-1.3.0"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/pytest-3.6.3-pypy-syntaxerror-offset.patch
+	)
+
+	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
+
+	# those tests appear to hang with python3.5+;  TODO: investigate why
+	sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \
+		testing/test_terminal.py || die
+	sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+		-vv testing || die "tests failed with ${EPYTHON}"
+}
+
+#python_compile_all() {
+#	use doc && emake -C doc/en html
+#}
+#
+#python_install_all() {
+#	use doc && HTML_DOCS=( doc/en/_build/html/. )
+#	distutils-r1_python_install_all
+#}