gentoo Easter resync : 12.04.2020

6 files changed, 95 insertions, 73 deletions

diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index 94fe97fe5c16..578a0204deab 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,5 +1,7 @@
-DIST httpretty-0.8.14.tar.gz 43574 BLAKE2B 4015bb234c2fe3017a43fff6e3b51a7f015d9d133756d4326750da1ea06ce1910d91d7b47625a08ec85856d156a0d8b3b18706e582578e3d186994b8e4f55c69 SHA512 5adab6450e8360cc21bab4136f64cd11757b9f292c7e27980fe2561f3e705baf4f0211b9e6ff4ec9ba96a788a6c5b5b1d26657972b67423c9c25491927b0884b
 DIST httpretty-0.9.6.tar.gz 7147633 BLAKE2B e1d02ddfce5ca987c6ef1a17723544f86a8573c2a6a26ec197072021e52015efce5064af21bfbe1ec03f3ac11c21717a80f114b5be2526b113e3bc0a608702f4 SHA512 bc1c64d34370209c732bc12dd9935600b647507ab2c8f18c85f348e9b5e853618ba39e10e5a073b35036e6cbe3db2cb7a342a721d0e4affa81fe178fd0b75d92
-EBUILD httpretty-0.8.14.ebuild 2256 BLAKE2B 2a553811b0824fa80abf5a70ff9cf7ec6b61acdd46825ccb6d377e4eb3ffa84e07a4e6fda3c32d04a34458c6eceb453bdf72ad360a725a7f8627aa13aa32541c SHA512 148a5ef6530975a99bdd0cba8b84f2ed840659dee5ead44028b1dcfc68f3627f5ef187ade81e43ca913ac58131f25498764d4891b256dbec61ef6258a02701c5
-EBUILD httpretty-0.9.6.ebuild 1038 BLAKE2B 1ed250b9421695a3bbda31c36b9a0d075ea339c334ea2df914a03012ca2fad120e2a0a88c6dbe2929bf91c7ddec5d84d6a25645739ee45075c2135217bc97cd2 SHA512 06faa1d183316930818e5ffab390eba49ace5e0bab3b7200ff20f2bad861aebcebc74048e194b56662b17634dcf4c61dc98f809e2d19433584960f2e11bfba8a
-MISC metadata.xml 590 BLAKE2B 60285c5aaf3d213457a6a12c9db5c19cf174b02435277f43d2f7a1eb0bf93d95c915f9aaa63692bb8274a1ebcac8ce1f9e71746668f20914c98bc98fcaf9a44b SHA512 0e7a2237bda277a4e295ca8c5c9e5280f0620821b03901eba1d8c73735868b5397256679ae64b530638c0805b68822493ca955bde37eccc67cd101ad5ecf3674
+DIST httpretty-0.9.7.tar.gz 6967749 BLAKE2B e2192871ca4f0f0c0bc7c39570251d26a6d78b6e5aabb1857df2b5c3533ae066400fca323d53e1790bfa2a1509e8ebb87d20d49659620087ca3c3765648662ec SHA512 4a1cdfc09af14ab2bc6eec84ad0905103ffb48c3154b127f646b39ff131584a52b1fd56bfe7a41959fc68d64eff94a221f9bf5a159a3dbfb3535fe4ac76c6170
+DIST httpretty-1.0.2.tar.gz 399185 BLAKE2B 033e954fccf6a351c09dac3c1585ddc65f064eca109dfd8f499fd510ea09ba3ce5198d3f4b54fb832b47425ab721ddc1b2da596b6066028bda1f0a1303cdc0ed SHA512 f9ef1c82f4fe3a31696e06228cea512664c5118b3c32910d7810d1fcf16b05d31b9b55db7bb6bd64967aadb162a2952757627439769db9117164b8248de9049c
+EBUILD httpretty-0.9.6.ebuild 1027 BLAKE2B 0309210657bdf6837a4fe2be9a7aca3ace9ef7483274045053a6b16d6f86268f0ed2c433bdc67c332b166da9e4525e3606d224091b61c4c3f92d2cc4448637e7 SHA512 5e8b08de759503299d45fe8bbe0e05dbc2669e98bcf923d58e45fd8c678f7e7fbed69139a31c65e92bddd816af9fb7b34582e6bb1eb81ed6179a22a3f00f8b8c
+EBUILD httpretty-0.9.7.ebuild 1032 BLAKE2B 1fcd6c84870e1817d6da4347995fe17ed0fb440580136631fc52e11bbab8d197b7bce5608ba4173c7c642f77c06616c23497ef02c2f4ffff937113d1103a7177 SHA512 ee61962c3e47162b16b9059f852ff84e5fa410b3c7b0331047493dfc06934d3db6ba2f7b1777b9af015b556192bc10d1d7b1555440d61314fc4799db1dc447ef
+EBUILD httpretty-1.0.2.ebuild 1038 BLAKE2B 52b1f2faf18a03fdf9769c138c2de275b8bef2774e668df5b2a0fce36ecc83aec18a6f19146320b05b43420783a239c4267cd322cec83af4409c3a693b20e221 SHA512 7081a41e72ebaa0dfa96795250ab6c814857c8d7d237181ff9c3197ec71be6923ef02614d2d068cbcf122b5ad53278c32f4f2a599c7a274fb708ab01d2e2546c
+MISC metadata.xml 615 BLAKE2B cbb8f3643ad93eb01b98baccd41c86da491499f068f5fbfab8d9baeef534b1d71b118c798f0d09777c251694492a55cf1e9bcd8be619c5fecaad63fd8ce52c56 SHA512 9cfef8b6e35ad7a533ef9b8efe991b0e248e6ab0444a169aa47111373d4da464d883cde23a4d6a6a2920ae5b92270ff18ae87b7f41fc2f87cde4595f9b0b2c85
diff --git a/dev-python/httpretty/httpretty-0.8.14.ebuild b/dev-python/httpretty/httpretty-0.8.14.ebuild
deleted file mode 100644
index dfc81e357fee..000000000000
--- a/dev-python/httpretty/httpretty-0.8.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-)"
-
-#Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
-	# py3.4 hangs on many tests and is deemed underdone
-	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
-	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
-	# Some tests excluded attempt connection to the network
-	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
-	# that occur within the folder tests/unit which upstream should address.
-	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
-
-	if python_is_python3; then
-		einfo "python3* not adequately supported by th package"
-	elif [[ "${EPYTHON}" == python2.7 ]]; then
-		rm -f tests/functional/test_requests.py || die
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python2.7"
-	else
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python3.3"
-	fi
-
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}
diff --git a/dev-python/httpretty/httpretty-0.9.6.ebuild b/dev-python/httpretty/httpretty-0.9.6.ebuild
index 6107ecbba7b8..512384afe0fc 100644
--- a/dev-python/httpretty/httpretty-0.9.6.ebuild
+++ b/dev-python/httpretty/httpretty-0.9.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/httpretty/httpretty-0.9.7.ebuild b/dev-python/httpretty/httpretty-0.9.7.ebuild
new file mode 100644
index 000000000000..54886415f6ce
--- /dev/null
+++ b/dev-python/httpretty/httpretty-0.9.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+)"
+
+python_prepare_all() {
+	# remove useless deps
+	sed -i -e '/randomly/d' -e '/rednose/d' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/httpretty/httpretty-1.0.2.ebuild b/dev-python/httpretty/httpretty-1.0.2.ebuild
new file mode 100644
index 000000000000..448717cb08c7
--- /dev/null
+++ b/dev-python/httpretty/httpretty-1.0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+)"
+
+python_prepare_all() {
+	# remove useless deps
+	sed -i -e '/randomly/d' -e '/rednose/d' setup.cfg || die
+	# tests requiring network access
+	rm tests/functional/test_passthrough.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/httpretty/metadata.xml b/dev-python/httpretty/metadata.xml
index e0e3bdc8d52c..cb4c911a4efd 100644
--- a/dev-python/httpretty/metadata.xml
+++ b/dev-python/httpretty/metadata.xml
@@ -12,6 +12,7 @@
   <maintainer type="project">
     <email>python@gentoo.org</email>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">httpretty</remote-id>
     <remote-id type="github">gabrielfalcao/httpretty</remote-id>