gentoo resync : 15.06.2021

6 files changed, 6 insertions, 201 deletions

diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index fa0cdafbc0bd..92f7bed5be18 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,12 +1,6 @@
 AUX requests-cache-0.6.0-test-install.patch 705 BLAKE2B b472ac6cbc27ed813e39a45ecb407a88d7942816290afd0b527f6926c1f50ae1edc2d919805fd6d84fd8ccae8a5c581909be5a97e806dedca3c38641cc32d5c0 SHA512 6faa08a94500559d3cf4f4eea3bb963215973587766426e2b8f0494398da9731421e3452478d0c1f5042f2abf91918030af042ee673b9c2c300daa2ca0c3822d
-DIST requests-cache-0.5.2.tar.gz 31159 BLAKE2B 4fca146a751064baf70954a71df64dbb7f8c9a4e27fec5dbea3620496ce78e7ccfb3785fb63705f513ff6fa938376b0c6acc4a2f584856060b1bc8388517df46 SHA512 355cc571a46b768615606a907a69ed065b3c4b5e74bb6c311abc7a28d9406f32fdea1db0dfd2b1c32dcdc82ed817ef7e0b30086c069de57307254617604c5177
-DIST requests-cache-0.6.0.tar.gz 52342 BLAKE2B 12af89721fcf1ae2e4ab14d7ac377f119ef312c64d3b9e5d80a36f26f3a9a798cf090835ee2c9bf886d0baa9b472f4c439d5a032573d442feecbbad930c239fd SHA512 b5b32b9cb99ec51cee67defde715df66b7c50a26f4124cbaf893685048fe188af0cf664232150e3b4fafe3b7a927716966efafadd711be01118d67ad802acef6
-DIST requests-cache-0.6.1.gh.tar.gz 47919 BLAKE2B 022fd94a332feae043cf646cefc368fdb6ca1833dcd58621a07425bfb0d7bcb5ff9913c8b53f2bc0769fd23e8f364c437ee10f16fd37d1d340e8c46bcba9d53e SHA512 f8bea03b05b2f1e55fe6c975b5f5caacff55250d81f41cf953052c77101fc726ff39f9d95e1fd2829ddb59215226026bdddfd93918feb478395375ac0e0a4439
-DIST requests-cache-0.6.2.gh.tar.gz 47962 BLAKE2B f0597f3c5f4a678b94f3b15023e3aba5247de3d79043e7e1cbd4ab0f2d4457e2f5feab130665129ae87baba56576312b1420ae16c2a34b44dc780bf05351615c SHA512 c97119127b1e80e6eec02938b2e0e8de785875f46d348215e05ee2d668feb77ed40f0dad4ed4a3ae53fb8e6708c8d7b13788e54694a38cef3ce22e83f13f97e2
 DIST requests-cache-0.6.3.gh.tar.gz 50303 BLAKE2B e8507a19f3883c050e1d819bf9ce8ebf720a5c6517e4004ecf745f5a197a8feac9cbca18ffa99001be0baffbad41d2ebfba5b63d90b55eda1d754d279242bbc6 SHA512 1fa801f60623dce0a5cd834272a74acf80b6ae52a602ae81fbd7e3653467800d9a58fb8220e30d53ef1b896aa01f2017f93dcbc2dacfd685ee9ae286f47077f5
-EBUILD requests-cache-0.5.2.ebuild 2832 BLAKE2B 1bae66755831dbdf4cacd154a8e40f74106f16f7ee6fe3561dc61449ac05e2a82b484d4b17c7926eec61e5b98c6c83ee466001a1cda6ed48526fee10eedda1f8 SHA512 a37ea9debd607221555025b1c5903aea17087479fa96f864b2aefd8bcaf22cade7c7fbb9b0492f37012b2b37299fa0759da780b6b6f0e30cf2addeb43c8efefb
-EBUILD requests-cache-0.6.0.ebuild 1547 BLAKE2B d4882712310d235f1e36e36927fd604fec9d0b27da8be825886f8419163c90fb804c31a511b894a86fae8cf42a4dcf127e99ee8d524c57acdc3c1710ba66122e SHA512 001b0302241e7fd38c37fce08724a6b7a98ee2fdc17fbfce76d6bbe4cc42c732a5a44ec56b60fcde69a0e294a0665e61e8b5e89ea4180d7f277ce52d836b6f24
-EBUILD requests-cache-0.6.1.ebuild 1178 BLAKE2B 6e6a82c6692d84e823b58037b5d5cebae4502dd64a46934b1ee808410340448b43ce92cd6743df8cd0eea1081d0aa459157b981c9df4bde67ee7b832863363ee SHA512 9f96b00d591bb46d78b4c1cfa1aebfdd29ab96e14731c5b8fccba1631da554889bd2c30a47d102efc07b54f1e25ff62766e8e648285960917f368c1f63875133
-EBUILD requests-cache-0.6.2.ebuild 1178 BLAKE2B 6e6a82c6692d84e823b58037b5d5cebae4502dd64a46934b1ee808410340448b43ce92cd6743df8cd0eea1081d0aa459157b981c9df4bde67ee7b832863363ee SHA512 9f96b00d591bb46d78b4c1cfa1aebfdd29ab96e14731c5b8fccba1631da554889bd2c30a47d102efc07b54f1e25ff62766e8e648285960917f368c1f63875133
-EBUILD requests-cache-0.6.3.ebuild 1143 BLAKE2B f4a54616e1bb9a27e0958170d01e00d97afd01a2f9bd2015d02bb4ea725a67ff90ed3821bc46b1a388c205e7088b5e541a5b965596301f34c471d097c9260928 SHA512 15c6f3ec0a0c97a35236d6f3cbd428f2084d98eecf77cf246d5ea935069ff2fbce944cc5119802aa1e97c5042f671ffa7db2a88f4737943333ed297923606242
+DIST requests-cache-0.6.4.gh.tar.gz 50322 BLAKE2B c9a6cae957604bdfa6057621e028fad83476e5d918bbf9c58e73f09f8615398946f3cf6e3737c9ff916cba68d82ed66a674557fb733c74b874b0f68e2430d9a0 SHA512 31e2217e54892d8ec5fc9fcf60f650960621b1f97029c90deca925b9a1be9eb5a3ddb6ae68e581c805f20136f93eefa70d51e7e9f086ecbae76f8e550bbe3f1a
+EBUILD requests-cache-0.6.3.ebuild 1141 BLAKE2B 40673e1032da1b5e785d6984b657a0e019ecd4e21851f5e8c36b28aaa66510a90c42b25cfdfdcdae6258837a6691d85278b1b7d2a3a3403da8bfa8981d0a455e SHA512 8df533649ab6ce4a5d137f542236d9a0804bb305b8e3b050ccb0e5f9591c51e4b49a6ad7e4b404a39164eecb7f6081715cd584b2e11b76f075fe6a605bb563f0
+EBUILD requests-cache-0.6.4.ebuild 1143 BLAKE2B e58329455d2f3b0d2ab391b55f50a6029f36288bebbc2e8b00b4b8ee97f6b0db034a74973bc4b69555cefe07d4e653bd4ece7fac1c0dad536509bc5881c1104c SHA512 75325063b3460c8ce23cc7b3fd628cd5dc9f37cfadbddef37fea164dc8e412867a3bf3b27f14b261d79beac0134ecd4c60c94022bb3411a648ec895e558a76cb
 MISC metadata.xml 469 BLAKE2B 7a0fbb271ec0f40665d6fbce539cb49a818f5f3876642c7d9d721566fac8fa81b0f39f4a2ce6b2b0884b6c2ea79a1bbf8c95d2f86c75372725dbc53757f0154b SHA512 6485eecd67956b0ad5eaaad22c5e68e9bc9acaf0330aca6c3c0a378b5153ecc7a086fac08e9932d03ea4ff6448c63958fc8faeabefd4c68140f44b0fda0f31f5
diff --git a/dev-python/requests-cache/requests-cache-0.5.2.ebuild b/dev-python/requests-cache/requests-cache-0.5.2.ebuild
deleted file mode 100644
index a64e64005f9e..000000000000
--- a/dev-python/requests-cache/requests-cache-0.5.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="https://pypi.org/project/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	# Ships with incorrect mock import
-	sed -e 's/import mock/import unittest.mock as mock/' -i tests/test_cache.py || die
-	default
-}
-
-python_test() {
-	local skipped_tests=(
-		# Slew of tests that violate network-sandbox
-		tests/test_cache.py::CacheTestCase::test_attr_from_cache_in_hook
-		tests/test_cache.py::CacheTestCase::test_cache_unpickle_errors
-		tests/test_cache.py::CacheTestCase::test_close_response
-		tests/test_cache.py::CacheTestCase::test_content_and_cookies
-		tests/test_cache.py::CacheTestCase::test_delete_urls
-		tests/test_cache.py::CacheTestCase::test_disabled
-		tests/test_cache.py::CacheTestCase::test_enabled
-		tests/test_cache.py::CacheTestCase::test_expire_cache
-		tests/test_cache.py::CacheTestCase::test_from_cache_attribute
-		tests/test_cache.py::CacheTestCase::test_get_parameters_normalization
-		tests/test_cache.py::CacheTestCase::test_get_params_as_argument
-		tests/test_cache.py::CacheTestCase::test_gzip_response
-		tests/test_cache.py::CacheTestCase::test_headers_in_get_query
-		tests/test_cache.py::CacheTestCase::test_hooks
-		tests/test_cache.py::CacheTestCase::test_https_support
-		tests/test_cache.py::CacheTestCase::test_ignore_parameters_get
-		tests/test_cache.py::CacheTestCase::test_ignore_parameters_post
-		tests/test_cache.py::CacheTestCase::test_ignore_parameters_post_json
-		tests/test_cache.py::CacheTestCase::test_ignore_parameters_post_raw
-		tests/test_cache.py::CacheTestCase::test_post
-		tests/test_cache.py::CacheTestCase::test_post_data
-		tests/test_cache.py::CacheTestCase::test_post_parameters_normalization
-		tests/test_cache.py::CacheTestCase::test_post_params
-		tests/test_cache.py::CacheTestCase::test_remove_expired_entries
-		tests/test_cache.py::CacheTestCase::test_response_history
-		tests/test_cache.py::CacheTestCase::test_response_history_simple
-		tests/test_cache.py::CacheTestCase::test_return_old_data_on_error
-		tests/test_cache.py::CacheTestCase::test_stream_requests_support
-		tests/test_monkey_patch.py::MonkeyPatchTestCase::test_requests_from_cache
-
-		# This throws many errors with network-sandbox, but doesn't fail the
-		# build
-		tests/test_thread_safety::test_thread_safety
-	)
-
-	# Redis tests need a redis server running
-	pytest -vv --ignore tests/test_redisdict.py ${skipped_tests[@]/#/--deselect } || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/requests-cache/requests-cache-0.6.0.ebuild b/dev-python/requests-cache/requests-cache-0.6.0.ebuild
deleted file mode 100644
index cfb8a2d6b048..000000000000
--- a/dev-python/requests-cache/requests-cache-0.6.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="https://pypi.org/project/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_any_dep '
-			dev-python/httpbin[${PYTHON_USEDEP}]
-			www-servers/gunicorn[${PYTHON_USEDEP}]
-		')
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-install.patch
-)
-
-python_check_deps() {
-	use test || return 0
-
-	has_version -b "dev-python/httpbin[${PYTHON_USEDEP}]" &&
-		has_version -b "www-servers/gunicorn[${PYTHON_USEDEP}]"
-}
-
-src_test() {
-	local hostport="127.0.0.1:23125"
-	python_setup
-	einfo "Starting httpbin on ${hostport}"
-	gunicorn -b "${hostport}" -D -p gunicorn.pid httpbin:app || die
-
-	local -x HTTPBIN_URL="http://${hostport}/"
-	distutils-r1_src_test
-	kill $(<gunicorn.pid) || die
-}
-
-python_test() {
-	local skipped_tests=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-
-		# TODO
-		'tests/integration/test_cache.py::test_all_response_formats[json]'
-	)
-
-	epytest ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/requests-cache/requests-cache-0.6.2.ebuild b/dev-python/requests-cache/requests-cache-0.6.2.ebuild
deleted file mode 100644
index dcaf77d008de..000000000000
--- a/dev-python/requests-cache/requests-cache-0.6.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-
-		# TODO
-#		'tests/integration/test_cache.py::test_all_response_formats[json]'
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/requests-cache/requests-cache-0.6.3.ebuild b/dev-python/requests-cache/requests-cache-0.6.3.ebuild
index c51bb467921c..f3c4e497d2ba 100644
--- a/dev-python/requests-cache/requests-cache-0.6.3.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.6.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/itsdangerous[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-cache/requests-cache-0.6.1.ebuild b/dev-python/requests-cache/requests-cache-0.6.4.ebuild
index dcaf77d008de..bf347f9dcc78 100644
--- a/dev-python/requests-cache/requests-cache-0.6.1.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
@@ -27,6 +27,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
 		dev-python/timeout-decorator[${PYTHON_USEDEP}]
 	)"
 
@@ -39,9 +40,6 @@ python_test() {
 		tests/integration/test_gridfs.py
 		tests/integration/test_mongodb.py
 		tests/integration/test_redis.py
-
-		# TODO
-#		'tests/integration/test_cache.py::test_all_response_formats[json]'
 	)
 
 	local -x USE_PYTEST_HTTPBIN=true