gentoo resync : 23.06.2018

2 files changed, 18 insertions, 11 deletions

diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index b81a7d3a8696..4af3ba125db9 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,5 +1,5 @@
-DIST urllib3-1.21.1.tar.gz 224266 BLAKE2B 35f521698c0b05fc9122650dde5ac00954eb2ad99ea3771d2a9e4fcb210b404a8173ee369f46b5e61ef7104621571386ad114c833522748b96294a87d0afa601 SHA512 0d2e9c2a0b895e4e232cad5ecc645ea9fd9b70191df045a220ee1f32e284c613c6790bcdfd9e40a22ea9d25ec397278fa700a3c3747e7b04222719d50df07859
 DIST urllib3-1.22.tar.gz 226083 BLAKE2B 6d3067ea1c9c90e2e759e6319115ed3d29ca1e31c4d1721d7e7aeed432ea4df22635d92fdb9ea91a411bbe67c72160abaa19e0d42870be0b0a866c003db6ec62 SHA512 132b69d7f390916bdcde66d46fbf0189d0c1f976f91778dcb0a9ef8174487b7bb4b37b9139e84f7c70234803be95284448aba0b820f3b54530c0c497ca7a1dc9
-EBUILD urllib3-1.21.1.ebuild 1639 BLAKE2B beeba41d094abaa84abb1be45a9a53b430140c55cc16aeddcbb29ee94a892458b8c5afe888923daabbf3a47030edac6b9e0b8246c6dd1c72365fa4f5a9c4055c SHA512 548ef7d2b368abe5bdc38b91d815cc8c4fe679339fc7b918d45ace213bd07af57050fdb0ebba430e7a9430f70884036ee4abfd5f3be4c57fd88a0acf84b84550
+DIST urllib3-1.23.tar.gz 228314 BLAKE2B 63cd0ed046ade8b775067df92f3589bdfa21788481292724ec6af85b5789cc990cd267e1a0dfd925529d147441232a89b4f1b23a1276fc7a68a7047cbf2ae8a4 SHA512 6baa76ad3bebc639d7ec0a042d809fba7ef3110de6164a321756389c250e218728d178708611049d91f39d17f24b8b08585edb2f2c260c987bd4c7204e0c0b5f
 EBUILD urllib3-1.22.ebuild 1755 BLAKE2B f74bfb8db93173a4388ae644e81cf4e3c8a3fc491ed0f3453def06a323b03ffe52bc471a32c0fdab64880554417082f0c4b7967f9d1bb185e04afdc65da3faf4 SHA512 8bab85bac5e97dadc1729434a108c82609a82a69b8af505aa77f267c897a368e49d23ba176ce45f583517e6844185ca2524c09cd31a1a76795dc99b8e6d1849f
+EBUILD urllib3-1.23.ebuild 1827 BLAKE2B 1a63b6eea9f725f7fd7dd59d1a88cbcc5c96b0eef5ff9bd8b39d310e1d1288a9c70de41d50017496dc8a352b07f65f46ec67140db985b58e3279b9198f8c1ede SHA512 79881ff73bc6d99248cbb5c0cf3785011a2b72698f74401fb8a7df0a26924445885738ed6de17202f91b1802ab33bf029a3ce6a9a547156584ae8269ec00b57d
 MISC metadata.xml 376 BLAKE2B 2e9ba1b23bd9ab2770d23ce9bdf21f4083f46184c22d1dc0bd449b6605c24a2ef0168e1503327b549ba55e81b7bb52fe5f73fa375f06f3c64fabfac6cf5a9d77 SHA512 97d216a4841d8c78655c923060a0040b75fbb2d19a42e51081fc63a4af80514db5abf09a02706cc52387ab7ac72e964f947f1ded50bcc7f8fae6d022d5353543
diff --git a/dev-python/urllib3/urllib3-1.21.1.ebuild b/dev-python/urllib3/urllib3-1.23.ebuild
index 7ccaed366840..bf71af6ce693 100644
--- a/dev-python/urllib3/urllib3-1.21.1.ebuild
+++ b/dev-python/urllib3/urllib3-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,16 +14,18 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="doc test"
-RESTRICT="test"
+#RESTRICT="test"
 
 RDEPEND="
 	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
 	dev-python/certifi[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
 	virtual/python-ipaddress[${PYTHON_USEDEP}]
 "
 DEPEND="
@@ -31,9 +33,8 @@ DEPEND="
 	test? (
 		${RDEPEND}
 		>=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
-		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-		>=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}]
+		<www-servers/tornado-5.0.0[$(python_gen_usedep 'python*')]
+		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 	doc? (
 		dev-python/mock[${PYTHON_USEDEP}]
@@ -43,6 +44,13 @@ DEPEND="
 
 # Testsuite written requiring mock to be installed under all Cpythons
 
+python_prepare_all() {
+	# skip appengine tests
+	rm -r test/appengine || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_compile_all() {
 	use doc && emake -C docs SPHINXOPTS= html
 }
@@ -50,12 +58,11 @@ python_compile_all() {
 python_test() {
 	# FIXME: get tornado ported
 	if [[ ${EPYTHON} == python* ]]; then
-		nosetests -v test || die "Testing failed with ${EPYTHON}"
+		py.test -v || die "Tests fail with ${EPYTHON}"
 	fi
 }
 
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
-
 	distutils-r1_python_install_all
 }