gentoo resync : 25.08.2020

7 files changed, 14 insertions, 193 deletions

diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index a2b823900c1b..cc116a0a39bd 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,9 +1,7 @@
-AUX responses-0.10.7-fix-cookies.patch 5131 BLAKE2B 48bf65ffb6c5cc1b2e1141aea27f0286df0959e61593a2798d76aae4fbb195fe1ce9801585553572a35db50ea1120e4841d6bd51e68461bd9e06b86af2fd2389 SHA512 1ad577f6dc4b8b708a35fc96675246397858f33f4a04be49606da0f25c9ec990f4e1ddc6fb9307f70e6a5e926aa92e5d66431c420ef5b76e73c51055e3ec0b7d
-AUX responses-0.10.7-tests.patch 383 BLAKE2B 3bca7b4ad5380fd13e29be1409d070d8ea1095a9b42636f5d7e428fc640eb9e0d5b3d0aeac8f2e128a3a1d32f30e1f376895708d294bfa6126687e79ce2ff97a SHA512 8230855b920eb75136e4158c0768ad249ba44933baa9f7b2dbef1e2fefea859bc67f65fd1601a11efe3d5a928b8f195ce6939aa0b659ea89ed09bf20cf106325
-DIST responses-0.10.14.tar.gz 24782 BLAKE2B 2c233ad41bfc1d9eeaaf84d2e8a98f5f808e39ffbb50c796aed6a3065827a0c33301c8d6ed1e7c4d88e6d0f7378796bdaba3816fd558f5797a725ea99835c54c SHA512 f7edf64d4e6d62fa7295b6ac95d60bc30adbf0b141d9624ed7ca03efe02790973aa8ebd3f93187d0fdb41e323c1d87184717b77bba2ea70a7ae25f4d9237314f
 DIST responses-0.10.15.tar.gz 25350 BLAKE2B 6d9dff99e2dc18b7361cb2b75f0438c62ab771364b1a572823cf1fb0cdb6175fee8c4cd372ac5d1b27ef31b88e66dd7d1410429213af240f6f743f0c85e36d1b SHA512 513df58b40968e271cfb429ee09ab2ca7c3cf2f6ebe3607276ed1b949670871f8d6993449cfd5871bfd119cda0c0628dce6ebe8ed40595696e550541413f12b0
-DIST responses-0.10.7.tar.gz 22666 BLAKE2B 9f6d8ee0cc36ebb94bf6ac4284b474d30754af339f623a8a899061392321ba48a1f2d21593fb5bf2e6fac7c65ca6c252b6b7a1072e5548f91db489633aa3b686 SHA512 dcdbac1555090309b17eec1c02887eea5080321ff359afc42e6b558954caec2ab757e6009ae539e6e4d002cd06f2289d909a28ae583e6fa062a5df89c301e1ff
-EBUILD responses-0.10.14.ebuild 891 BLAKE2B 9baf6db2b12499e56f721a5dce659df8b4c1dcc62e99693074a69c3482d9a41a99010471b93aa3197c1a5362fd4b0d6efad8df409cd30a3bd1d16b19de48c039 SHA512 71013aebf6c545f207574a33f2eef76dd74cb146f6530cdf707fd2f99c77d2a2e0d1ae87900630430341f9cd57a3ca2b2f12d881f913d9496748ad753a7acf7e
-EBUILD responses-0.10.15.ebuild 681 BLAKE2B 4320c6c1a575e494734792000f4b6d978d5b24e0555b4b077f291ef42cce0f739b91018c4042d9c50583205ee829875055f447710861e5bffd47c8dad4bb9f3c SHA512 6c55687cc49fb0d5505b3528ad96403b72714ceffc22fbb1cd868460799fa205631542424d5e3a76e908597788a3cc5a664b4f2bba2cb77fa6956615b7cd492f
-EBUILD responses-0.10.7.ebuild 862 BLAKE2B 23eeb7d1780bf4224202b1c5d8b21d086ebc1a209e5080b2f23d26e7ebde9a85eb461ae690dbfa58b5c6fe04a62f911a52dc0b6166d3d073f45918b15e02fb42 SHA512 f23013dae38c96db5cf025a3b83910790f4f70b2f28ac491b1355ce01cbd5d6eb3c4adbbf6bfded90a69c17829f49a737d85c31b12e73de0d53fcd77910e91f6
-MISC metadata.xml 438 BLAKE2B 9a2c389d84feb9087edaad524953e8a439dc914f293a1f5dc9a15f36101965ece4e28ab5f57b193dd30a2134b17e96feb218c898fd1164dd0c94234b54689a1f SHA512 efdf808423b4e47a6888b09d08b563f36a13867d355476ec10e7f247e6841bf682cb35c4432a011458d496dae79acb1ad4a38e03d3895a53e666edc3c9d4fca1
+DIST responses-0.10.16.tar.gz 25420 BLAKE2B a71402d30a30be18a445f2377498760fb00c5ed1fe0f61503675b4d0730bfd305711a0d56dd972a7c1cb439c3202819570eee81b6214fa723725d584f96905db SHA512 ec6738d3f7a33f7e3fbc95b1aaa5a10aa038dcbd8c9fdc4dc0ffc263e0cd613e6f2ce8e2fc2b59c91a30dec9677219fbb2630ec4d5d8d4340526fe72e24bd89f
+DIST responses-0.11.0.tar.gz 26534 BLAKE2B f4558884bec08c21186f4b79dbbce1b87fac27992cc5dae5f4eb50291daa1fb3f69253309eeb25f5ed84419ac06290e3e81e3b3ea85aeed2691aeb975e91734d SHA512 8594c3a85fa43c1464e30620e8f323084cb3d9e528936abaa8a9b81a5f719511c032941e90a4e03170d066bc90b9a12c2ad0a804cb43f9d616b0f9735dcf90f5
+EBUILD responses-0.10.15.ebuild 679 BLAKE2B d645fc1d382f505a1e6edc028ea85e21aabb3f3af20748affa0cb9ee5da00cd814b6becc8dfe064636ace682c88778620aee83f8716e79f215b1725a752c8312 SHA512 20d427ec114cb68fa7f1a711d21d489797ee8f9d9dbfcdb281be0c99c6e7920d54b7a3376cd8b761cfb7af5f3eceb404d9cfe6475d68f7d607e60f40d4e2e031
+EBUILD responses-0.10.16.ebuild 741 BLAKE2B f468d5cf7b8ac61d6712938ef415b12d4a92fb82f78bbdce63c67f073a7db5a2a858ed3bdb832e078fa09e4996f32702ae42506a359adfd2618c1fd1d9b1ea2e SHA512 7051cd03689b283a125be6e27f49b50120ebf675f221985f4fcae839a7239ecbcf2006026a56043f7526dc66feff2e3bb778579ddf05bd18cf06f228be5c61f3
+EBUILD responses-0.11.0.ebuild 741 BLAKE2B f468d5cf7b8ac61d6712938ef415b12d4a92fb82f78bbdce63c67f073a7db5a2a858ed3bdb832e078fa09e4996f32702ae42506a359adfd2618c1fd1d9b1ea2e SHA512 7051cd03689b283a125be6e27f49b50120ebf675f221985f4fcae839a7239ecbcf2006026a56043f7526dc66feff2e3bb778579ddf05bd18cf06f228be5c61f3
+MISC metadata.xml 462 BLAKE2B c0afeab502da79631572ffa360f5b5cb19d41be177e9dc028041642cc756e08df0df9685c49825a40f3f343a29defe87f1f1e4805568d1037eab73895606221e SHA512 1b33da0d6d1ea49e0f108362c903f3521704ce8eaf1f328441eeb6950c19900eae5abf08204a0402cf7387077f32da97e5a84b2b6bb7c347a39a38e18032de33
diff --git a/dev-python/responses/files/responses-0.10.7-fix-cookies.patch b/dev-python/responses/files/responses-0.10.7-fix-cookies.patch
deleted file mode 100644
index a744e652ea7f..000000000000
--- a/dev-python/responses/files/responses-0.10.7-fix-cookies.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff --git a/responses.py b/responses.py
-index 9c57301..83fef83 100644
---- a/responses.py
-+++ b/responses.py
-@@ -23,6 +23,10 @@
-     from requests.packages.urllib3.response import HTTPResponse
- except ImportError:
-     from urllib3.response import HTTPResponse
-+try:
-+    from requests.packages.urllib3.connection import HTTPHeaderDict
-+except ImportError:
-+    from urllib3.connection import HTTPHeaderDict
- 
- if six.PY2:
-     from urlparse import urlparse, parse_qsl, urlsplit, urlunsplit
-@@ -309,11 +313,11 @@ def _url_matches(self, url, other, match_querystring=False):
-             return False
- 
-     def get_headers(self):
--        headers = {}
-+        headers = HTTPHeaderDict()  # Duplicate headers are legal
-         if self.content_type is not None:
-             headers["Content-Type"] = self.content_type
-         if self.headers:
--            headers.update(self.headers)
-+            headers.extend(self.headers)
-         return headers
- 
-     def get_response(self, request):
-@@ -372,11 +376,20 @@ def get_response(self, request):
-         status = self.status
-         body = _handle_body(self.body)
- 
-+        # The requests library's cookie handling depends on the response object
-+        # having an original response object with the headers as the `msg`, so
-+        # we give it what it needs.
-+        orig_response = HTTPResponse(
-+            body=body,  # required to avoid "ValueError: Unable to determine whether fp is closed."
-+            msg=headers,
-+            preload_content=False,
-+        )
-         return HTTPResponse(
-             status=status,
-             reason=six.moves.http_client.responses.get(status),
-             body=body,
-             headers=headers,
-+            original_response=orig_response,
-             preload_content=False,
-         )
- 
-@@ -402,13 +415,22 @@ def get_response(self, request):
-             raise body
- 
-         body = _handle_body(body)
--        headers.update(r_headers)
--
-+        headers.extend(r_headers)
-+
-+        # The requests library's cookie handling depends on the response object
-+        # having an original response object with the headers as the `msg`, so
-+        # we give it what it needs.
-+        orig_response = HTTPResponse(
-+            body=body,  # required to avoid "ValueError: Unable to determine whether fp is closed."
-+            msg=headers,
-+            preload_content=False,
-+        )
-         return HTTPResponse(
-             status=status,
-             reason=six.moves.http_client.responses.get(status),
-             body=body,
-             headers=headers,
-+            original_response=orig_response,
-             preload_content=False,
-         )
- 
-@@ -619,11 +641,6 @@ def _on_request(self, adapter, request, **kwargs):
-         if not match.stream:
-             response.content  # NOQA
- 
--        try:
--            response.cookies = _cookies_from_headers(response.headers)
--        except (KeyError, TypeError):
--            pass
--
-         response = resp_callback(response) if resp_callback else response
-         match.call_count += 1
-         self._calls.add(request, response)
-diff --git a/test_responses.py b/test_responses.py
-index c2a4f01..65904de 100644
---- a/test_responses.py
-+++ b/test_responses.py
-@@ -657,8 +657,56 @@ def run():
-         assert resp.status_code == status
-         assert "session_id" in resp.cookies
-         assert resp.cookies["session_id"] == "12345"
--        assert resp.cookies["a"] == "b"
--        assert resp.cookies["c"] == "d"
-+        assert set(resp.cookies.keys()) == set(["session_id"])
-+
-+    run()
-+    assert_reset()
-+
-+
-+def test_response_secure_cookies():
-+    body = b"test callback"
-+    status = 200
-+    headers = {"set-cookie": "session_id=12345; a=b; c=d; secure"}
-+    url = "http://example.com/"
-+
-+    def request_callback(request):
-+        return (status, headers, body)
-+
-+    @responses.activate
-+    def run():
-+        responses.add_callback(responses.GET, url, request_callback)
-+        resp = requests.get(url)
-+        assert resp.text == "test callback"
-+        assert resp.status_code == status
-+        assert "session_id" in resp.cookies
-+        assert resp.cookies["session_id"] == "12345"
-+        assert set(resp.cookies.keys()) == set(["session_id"])
-+
-+    run()
-+    assert_reset()
-+
-+
-+def test_response_cookies_multiple():
-+    body = b"test callback"
-+    status = 200
-+    headers = [
-+        ("set-cookie", "1P_JAR=2019-12-31-23; path=/; domain=.example.com; HttpOnly"),
-+        ("set-cookie", "NID=some=value; path=/; domain=.example.com; secure"),
-+    ]
-+    url = "http://example.com/"
-+
-+    def request_callback(request):
-+        return (status, headers, body)
-+
-+    @responses.activate
-+    def run():
-+        responses.add_callback(responses.GET, url, request_callback)
-+        resp = requests.get(url)
-+        assert resp.text == "test callback"
-+        assert resp.status_code == status
-+        assert set(resp.cookies.keys()) == set(["1P_JAR", "NID"])
-+        assert resp.cookies["1P_JAR"] == "2019-12-31-23"
-+        assert resp.cookies["NID"] == "some=value"
- 
-     run()
-     assert_reset()
diff --git a/dev-python/responses/files/responses-0.10.7-tests.patch b/dev-python/responses/files/responses-0.10.7-tests.patch
deleted file mode 100644
index 764b22ab3af3..000000000000
--- a/dev-python/responses/files/responses-0.10.7-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/test_responses.py b/test_responses.py
-index c2a4f01..2b85172 100644
---- a/test_responses.py
-+++ b/test_responses.py
-@@ -928,6 +928,7 @@ def _quote(s):
-     return responses.quote(responses._ensure_str(s))
- 
- 
-+@pytest.mark.skipif(six.PY2, reason="Broken on python2")
- def test_cookies_from_headers():
-     text = "こんにちは/世界"
-     quoted_text = _quote(text)
diff --git a/dev-python/responses/metadata.xml b/dev-python/responses/metadata.xml
index 555ddb8d41be..79b9c53250f4 100644
--- a/dev-python/responses/metadata.xml
+++ b/dev-python/responses/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">responses</remote-id>
 		<remote-id type="github">getsentry/responses</remote-id>
diff --git a/dev-python/responses/responses-0.10.15.ebuild b/dev-python/responses/responses-0.10.15.ebuild
index adae6e7ab45c..aab1f45c9db7 100644
--- a/dev-python/responses/responses-0.10.15.ebuild
+++ b/dev-python/responses/responses-0.10.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/responses/responses-0.10.14.ebuild b/dev-python/responses/responses-0.10.16.ebuild
index 6010ef70932e..7dc543a4597d 100644
--- a/dev-python/responses/responses-0.10.14.ebuild
+++ b/dev-python/responses/responses-0.10.16.ebuild
@@ -12,11 +12,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
 	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
@@ -28,15 +29,4 @@ BDEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/responses-0.10.7-tests.patch"
-)
-
 distutils_enable_tests pytest
-
-src_prepare() {
-	# py3.9, doesn't look important
-	sed -e 's:test_arbitrary_status_code:_&:' \
-		-i test_responses.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/responses/responses-0.10.7.ebuild b/dev-python/responses/responses-0.11.0.ebuild
index c3ba60ec5686..7dc543a4597d 100644
--- a/dev-python/responses/responses-0.10.7.ebuild
+++ b/dev-python/responses/responses-0.11.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -12,27 +12,21 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
 	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		${RDEPEND}
 		dev-python/pytest-localserver[${PYTHON_USEDEP}]
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/responses-0.10.7-fix-cookies.patch"
-	"${FILESDIR}/responses-0.10.7-tests.patch"
-)
-
 distutils_enable_tests pytest