4 files changed, 48 insertions, 66 deletions
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index 988980bf7c83..8a7a606b6fe3 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,5 +1,5 @@
-DIST requests-mock-1.5.2.tar.gz 47581 BLAKE2B 46beefc45e01355939a76b85e43a5b57cb1a870666eab7f610cad3e8a04a17da6a0864f9776a0f09028c847e8a4f7d0d2389a36f9a0431ed733a364d0f712c0b SHA512 206c91e892df84e38dcdf1264559128cfece76be2ce43b9c98238dfd438795d8c4ce3fcd43feb30246fbfca2d78832a23430ce1c9d3a7dc6e4417df5d65a8d3c
 DIST requests-mock-1.7.0.tar.gz 51705 BLAKE2B 1104422ab28678ee9e964fd853e7d61c23bc2f0dfb3861c2829578d1f91d533d195ce687fbc8596aba32da4b369050398d891125dc894e55fcb73ca81268b30c SHA512 6ad71fb87519f93812e8ae0d058a4b65a4492e86f05cacc37f95be1a6f0239a2c3f3d20a7e6f44bcc21f009574e4e78c2149394c2570d305efbdd68ec07b24a2
-EBUILD requests-mock-1.5.2.ebuild 1679 BLAKE2B 173e105d21ec53273dcb07cda38a23dd214903687440a4164e041e94c2cbf96c6e213bad399ca8f4bc655db58e217bdf92347c75b75a14cfc460ead42059d249 SHA512 642a4bee85b971086436841a53b170c4d965c3d74eb62eb62752b34fdf4d72aaf30ece942014f7ea403cf96d8212a2344168a29c9f3b17d9c6cb4cd0cf1eee97
-EBUILD requests-mock-1.7.0.ebuild 1240 BLAKE2B fa413f9527a15fd4b432b81d062c6eba6ba5ca399aaf2af5307e3f1ff328ac7987df5ed3da856df5c2502be6a58d145795f779f89e81eb8c25c900321ec1ab02 SHA512 f8460225e6316cfcba55b886694f1e33db89e390c2e238bf9e3dcd52d7db8521b0bbd17bcb057606c4ff9065f45af84168a35c89c768e21ecce13bf65fecb4fb
+DIST requests-mock-1.8.0.tar.gz 59794 BLAKE2B 2bdcd180ea793a02cf34eda356d90c0e338cec6f3fb718564026d28ea06ac975073f291be9cb685f012c803fdeca1fe29139537529e292b91a3356f0b781f97a SHA512 252bce965e0fca03cd5ce09912c726045f9c632e90bfee13b06c9f3e2c6b70eab7f39cf8e7efb3b7d2cf2b5d79cc5c5ba6e2379b3d48ce33bf78861ada911918
+EBUILD requests-mock-1.7.0.ebuild 1238 BLAKE2B 7947c44ed2addbb388d0f7b7d9fafbe8d99a451b8b9fa84557d9250d9f465e80de6e1c94ab47a01223d19cbf85a16a56810c63e13fe1c8d5d8b5accbc0ba788b SHA512 d8e4d920e4113e5a2ffbe1acfcf49bc040c3b8a57584d0aa1c26d7a69f5f4f55dfddc9ecf53ea484c9a52af96828cce82ccdea0f8719593022809f135c422b36
+EBUILD requests-mock-1.8.0.ebuild 1240 BLAKE2B 631a568349ccfeb752bfda464adbe0ddbc34f2a54b220c3ae78349e525ac8a20ca4b2a2ca124ef6f89069125e9f723c7b5f359683a7224969bfe0b17caa7b13a SHA512 1cb2318688d89dbce7f1579472bfcd86597d1157ac4d04ac64ded1c94b96b1d16f53d70239db77853b373466e79f3d5212c3437e274ed5d231827de7010ec3b2
 MISC metadata.xml 454 BLAKE2B bcadca6cd81b333dff341a15c22e548336cf6cf8fc342ec147783d516d72c1168991b61b9038979923e92cc3304c86021b2a38b39e5d55469b9cdfe95170a23a SHA512 9eb41db434308c8b293b881364482e08da91881266ae4d5b45dc79fa12b0187e5aabbd82d771ad7c5fe4e2840d581f9a8ce63658f0f3124a19e26a35c5f25119
diff --git a/dev-python/requests-mock/requests-mock-1.5.2.ebuild b/dev-python/requests-mock/requests-mock-1.5.2.ebuild
deleted file mode 100644
index 73c0133756ad..000000000000
--- a/dev-python/requests-mock/requests-mock-1.5.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock out responses from the requests package"
-HOMEPAGE="https://github.com/jamielennox/requests-mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/subunit[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# Disable reno which only works inside a git repository
-	# Disable intersphinx
-	sed -i -e "s/'reno.sphinxext',//" \
-		-e "s/'sphinx.ext.intersphinx'//" \
-		doc/source/conf.py || die
-	# Remove the release notes section which requires reno
-	rm doc/source/release-notes.rst || die
-	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build doc/source docs/source/build/_html || die
-		HTML_DOCS=( docs/source/build/_html/. )
-	fi
-}
-
-python_test() {
-	rm -rf .testrepository \
-		|| die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/requests-mock/requests-mock-1.7.0.ebuild b/dev-python/requests-mock/requests-mock-1.7.0.ebuild
index 7c051fe73391..2a7ab3015eea 100644
--- a/dev-python/requests-mock/requests-mock-1.7.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-mock/requests-mock-1.8.0.ebuild b/dev-python/requests-mock/requests-mock-1.8.0.ebuild
new file mode 100644
index 000000000000..e5e13b78cd41
--- /dev/null
+++ b/dev-python/requests-mock/requests-mock-1.8.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock out responses from the requests package"
+HOMEPAGE="https://github.com/jamielennox/requests-mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc/source
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Disable reno which only works inside a git repository
+	sed -i "s/'reno.sphinxext',//" doc/source/conf.py || die
+	# Remove the release notes section which requires reno
+	rm doc/source/release-notes.rst || die
+	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
+	# Disable a test which requires purl (not in the tree)
+	sed -i -e "/^import purl$/d" -e "s/test_with_purl/_&/" \
+		tests/test_adapter.py || die
+	distutils-r1_python_prepare_all
+}