gentoo resync : 18.11.2019

6 files changed, 24 insertions, 94 deletions

diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index bc1e4d53f16e..9c5dd47b7082 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,14 +1,10 @@
 AUX hypothesis-3.74.3-no-werror.patch 646 BLAKE2B d398319202a662d87018d99919ba0745d628c08afae85fda67113555f61babd83cae5dee7a79b224d7aa5ead73f29a91441f0de27086b9a4f74a3b53dda05be1 SHA512 d25646d35b94dc19b8c9c7a97601a7666ca6140b6a22a4f6b0bf232a7bd3a75c533f53feb9758cc8d5c9189163a0d90149f57c08dd945b763c0920aa361f2bbc
-DIST hypothesis-3.6.0.tar.gz 73586 BLAKE2B b0ec133e8c71f752114211061155c15a7d536e771ba85eab6489440b2063d3083018bf8502d9e9dbc73105ee5f03060e3189e64574a3dfa052b091040e7e7915 SHA512 cb885628e5c38ab9312cfb177ebc3c014617d21031737f5fba343ba485c1b8ff82b1302e7bc1d3e79192bfd8324fd0501498c968f3ac8343829f8965f6354389
 DIST hypothesis-python-3.59.1.tar.gz 500529 BLAKE2B 5c171045e363f2337d7ca30797b9fc7f96430c805dd4b3ec78fe927247d2c2ba4a216789a82f1e956b89d66c5ecdb2050a5f93467f2d557a05d1d48507fc06db SHA512 c3aad4cc54152963806e09af5f351e60e30cd64ad48ba3d922451b10dbb1747ea3e5d432ebc611dcb0646687d7e8755051b967304e74798d091be0b2901c832f
 DIST hypothesis-python-3.74.3.tar.gz 552616 BLAKE2B e19a0991e7ae2fa6208c81d336cc66e3392bb78663f567fe28b570a1463a5359ccf713776f1f9cbd19a27a53b9a71a5be6eedfa05599fa12c047c373aa339592 SHA512 f4927d6e908a9222fa06f82ad6e4cf90c62a0a3d0c7632c17ee57a3705239901fcb5dbbcfca402c153bf2bea9dde0e51c852d2024ed5a236888327963fe13a3e
-DIST hypothesis-python-3.83.1.tar.gz 564466 BLAKE2B 7b4c00a46b5a547bfc98711b795525c09d91ed41ac2c1dcf9c3c571e32819c77c6f6a4311ff32020a6d8e837dfcd03f7e2d842613148201d476615831483a737 SHA512 d828dbfe8637b6388b8c77af08970c2b45cd8f6960f26b1c54f3fbeba012e225d116802cae70ee28321de9d961397e60a5ff8cbefc02d085b6f6978f6bddf56e
-DIST hypothesis-python-3.85.1.tar.gz 568995 BLAKE2B 65297e73ec833beee05f7ad4f137cdbfe1b28cc478df31fedf8fc2c5183e70c10d5254fdba906842551fcfb7280ac59b3a7dc5cf752700c770c90d158cb81324 SHA512 cf6951d8cb70539b57147f422e43296518edf416200eec220f0c3f258ee6215f858e496f66b340ea68d1754cd936fc26a4ce4d1ee7a38cf338398d316c06cc24
 DIST hypothesis-python-4.15.0.tar.gz 1175925 BLAKE2B f3e3888b3f4e542d567bdaad2582eb23bd8ab2e218f1bde82ba1639123f32e8c147313c22b15781d8986574813b5f6eb7c23ce28367e86bb304d33a23f179fa0 SHA512 7d9788b351196fc20e66e210b7d60b4ddb1507b85cf5a29de228600e07f676ccd1352f5d2ab0820b3c8c1a1e8ff145225f00a25aec5f325cc7405ffd0dfcd9f7
+DIST hypothesis-python-4.44.2.tar.gz 3240386 BLAKE2B 3fe3295ba1f7401e1fb74af894d91eda525f8ef51eb893f1f8e5224cead8572f3c06f6a4bb345c123e56ed06d0676c85dc4477a80e54480baa6bd9f5f2bc069e SHA512 bebc5da337fa74a75d08cb57531c2f6b8ba1ab16d1a3d9be8348cd56ada1ab25a34e3b812a4aa71bf172bc97ebc8df0accdad37466f9162c3f8f2a8edbea9da9
 EBUILD hypothesis-3.59.1.ebuild 1145 BLAKE2B f42287ae99cacb4ef4b117a48587b18965b6d84bd2c15901897876e1cf8db6755d0c032863d7aae0e8d56a5e8205bd941dde5e4058bd543bbeb6efce7e64c3bd SHA512 08331c50fc7e3169b94cb3ed32c95dba578915bb293afba510207a03733c2170a69f6d61b900d6a85d9b88a1a5566896bba4ed3950139d341cdd746e6fa503f4
-EBUILD hypothesis-3.6.0-r1.ebuild 906 BLAKE2B 7e2716fef80debfdb2526a31eb2f8be695cc8cb125acf71b180d53599d05a87c5f0fe69aa53fb1736ee40596da43508bb89c379e8f3dd21fe465b0d4518359ee SHA512 5ba0b7a52ad54fcacbcbea6497389e870da0c830f7b3cedcc9c5ae02ea5bc315abd5018c6c35c39b8b8ebc6baaab8afa9826ac693d0319f77116d832350db8a4
-EBUILD hypothesis-3.74.3.ebuild 1572 BLAKE2B 79ea26bf971fcca8188ca0912d6f22edca0e24bad1d8a278a97542d6daf4ae273075c5953f5202a841da59432063e4946e6842646e06b9acb404e9c993bbd12a SHA512 7461b3a2f39f9417a1dfda7218f90d9b7363f4709c0b7661a3e7007efe9b230512c633fc490af8fea0042cc4f1adf58eba7784dfda7f0ac0785d59dfa98e2c55
-EBUILD hypothesis-3.83.1.ebuild 1461 BLAKE2B 8b98c817616fe3cc7c656451b2b3bf22547c9e902bf95c4b3cd418b2fe365a7050f4108eaa99a9f6aaf0500806f2b6d0fcfef08ce5c62c73e97d8549adfa02b0 SHA512 65a77901d31bd4146607bf8d7437280504467e0651839fcacddecc83c3b55517579ec2681e4de380becc1001fd9142e7f8df0f039efd9b86f99de7e11ba7204f
-EBUILD hypothesis-3.85.1.ebuild 1461 BLAKE2B 8b98c817616fe3cc7c656451b2b3bf22547c9e902bf95c4b3cd418b2fe365a7050f4108eaa99a9f6aaf0500806f2b6d0fcfef08ce5c62c73e97d8549adfa02b0 SHA512 65a77901d31bd4146607bf8d7437280504467e0651839fcacddecc83c3b55517579ec2681e4de380becc1001fd9142e7f8df0f039efd9b86f99de7e11ba7204f
-EBUILD hypothesis-4.15.0.ebuild 1465 BLAKE2B a613af93928ed213fbe4367793fd8f8ebb19d7040f5f4ed5df72ed83176dc8224e1637f8f4d0f0442ba81b2cd5212376ca0ce59a1ce02431a32ce116a2cbeafb SHA512 5d4c23e5b09e3ecf80a16021a5574073b25e0c220c1564ad867f61c287bf6ebf910e7f3a123da1a4a257dfea8a7d6580ee044da77846a49c1e6fcca67ac092fa
+EBUILD hypothesis-3.74.3.ebuild 1599 BLAKE2B 595579389557f85fa0902229be998b9ca0a366b54b33ad6162d120552eafa3420eb614fb73d232bf9c56d26b0f6eb91043ceb4a636da600e8903dc4539011604 SHA512 7b39b0dcbe2e3a263fddf52641b5e9e497830170d4f6e0f190fb8c1e895127dea2a1aa022b05606e89f5b07289dd981dd82c5b6b8ca912296530c83d67bf264f
+EBUILD hypothesis-4.15.0.ebuild 1492 BLAKE2B 9c1a5420d3eac3ac755f2de90af30afc5a121f19482d32cfae903606a36693985b2528e7ef75cc69cf3b50f37579dbc91b01bc2e4be79418281348f6ca91fff0 SHA512 9d5d3c7e99f76b9da9d75d7773b33593d20bd00be7b08d5994fda5eff300c9b9e3ddb41d9234fc0fde06fb03e63cf95545b92733742a75a7833c101ba623da91
+EBUILD hypothesis-4.44.2.ebuild 1698 BLAKE2B a8371d3017c0f419e1481ee3a4ab8389cece64bcb93151b986303426e9976d6a684ba32d27f64fcf3a3e5953a85edbee1ca7df1e227daf24c4d700064e70e989 SHA512 413f1ef75237aa1581e433aea1adb38a9de65a1922b88b77ec634cf312924452b50998e3fc31c124e1ac1ce9dc98581edf75b4458a98b1999b89e4df0f01d4a2
 MISC metadata.xml 379 BLAKE2B 3623a13a813bf71f9474fa018b2f83392ec168193b9853cabcf112267d38e7278e97a415bb8b7e52f9ebb28864b8709a64996dcb0d97e1f03b3ecb31a944d74d SHA512 40bb5c1916d9027ff81cd32073de34753a30d8430f36d0fd16667a111af8fd222379dcd817edd723d362f5ff5578ad7b212f98388c00de6dff1a64bd2c3978b0
diff --git a/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild b/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
deleted file mode 100644
index bb6f1bc67345..000000000000
--- a/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/DRMacIver/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*')"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-3.74.3.ebuild b/dev-python/hypothesis/hypothesis-3.74.3.ebuild
index 46b85f42c786..26a6aa58bddf 100644
--- a/dev-python/hypothesis/hypothesis-3.74.3.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.74.3.ebuild
@@ -16,6 +16,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/attrs-16.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/hypothesis-3.85.1.ebuild b/dev-python/hypothesis/hypothesis-3.85.1.ebuild
deleted file mode 100644
index cd2a062ba950..000000000000
--- a/dev-python/hypothesis/hypothesis-3.85.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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} pypy{,3} )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/attrs-16.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-python_test() {
-	pytest tests/cover/test_testdecorators.py || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-4.15.0.ebuild b/dev-python/hypothesis/hypothesis-4.15.0.ebuild
index fea3d05494ba..3b10a7ba271c 100644
--- a/dev-python/hypothesis/hypothesis-4.15.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.15.0.ebuild
@@ -16,6 +16,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/attrs-16.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/hypothesis-3.83.1.ebuild b/dev-python/hypothesis/hypothesis-4.44.2.ebuild
index cd2a062ba950..f4686aaabd7a 100644
--- a/dev-python/hypothesis/hypothesis-3.83.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.44.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1 eutils
@@ -16,26 +16,35 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
-CDEPEND="
-	>=dev-python/attrs-16.0.0[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
 "
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
+		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.3[${PYTHON_USEDEP}]
 	)
 "
 
 S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
+src_prepare() {
+	# avoid pytest-xdist dep for one test
+	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
+		tests/pytest/test_statistics.py || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
-	pytest tests/cover/test_testdecorators.py || die "Tests fail with ${EPYTHON}"
+	local pyver=$(python_is_python3 && echo 3 || echo 2)
+	pytest -vv tests/cover tests/pytest tests/py${pyver} ||
+		die "Tests fail with ${EPYTHON}"
 }
 
 pkg_postinst() {