gentoo auto-resync : 29:05:2023 - 15:17:30

3 files changed, 142 insertions, 0 deletions

diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index c008190830e3..f1a4fa94ae10 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,3 +1,5 @@
+AUX responses-0.23.1-urllib3-2.patch 2560 BLAKE2B 2a36eb2cf89e07f3a2508020a4ab95f252990d14400bca7d48c682ae12e315f951dfe666c1fa20a8a1c474fef4be9a104928faec5d9f1d39a693bd97af66d531 SHA512 6ebf784d01200cdb8c0abd9bd3335d670734a549b944f156cefd02ee48d24128fb2a6fd6d16e1f01a556fbebf2d71221e3dc33dde6096aba72dc14bdd99de4df
 DIST responses-0.23.1.tar.gz 72966 BLAKE2B e75db65ab98ebf7773c469dee5486b52b6f5c1f39d847c6f38a65e664c244937716c792cf009c750019043845b95c11ea38f99d68137899ef2ef48e60edc0c2a SHA512 2c05ac5c4ccca351940d3821b0830cee366cd7c9637f1e4c1e6b40c72ed2168a1036de634f03bfaaa2f7270e3825f6d9e8d31fc7a16f321f1de1cc64255454a1
 EBUILD responses-0.23.1-r1.ebuild 1208 BLAKE2B 7ee60ee8cae180007ec6cfa9debacea59120c67f101a7a2439a86b87f00aac26ab84ff2804e874cc9803473c67eccf614514b921b982f15b5c01a7194f824f34 SHA512 a7a2530264c93c2761292f2428aaa867ede54d1761ebf559b6a6185367febea696e4eafa8a178a717c04b2137196cee3e476c27598e5c7ed2021303c480dc895
+EBUILD responses-0.23.1-r2.ebuild 1305 BLAKE2B eafc60a9959c67b51a74a6ac1f913da0ae85bb8af058d17641e82b6b9e0c8ce4dfbd20692a9094ad2329c6f9837145235008713736098df4012388baffe7f926 SHA512 719b8eac18bc7b99a417d76fd1a683b5bfd062769b2c9c7333be74f6730041368f84e345f2a402f711c4f47170e30f9d288e1aa7893359b0b96b9566617bc3a6
 MISC metadata.xml 463 BLAKE2B 64d3c7be57863ae6088ce746fbfcc68a8eefc37c6d8fbe1bc6866d4c24ad18e75215158d89217d13f0e5b9db2e82d1aab86fa2ff664098239440bfd3fa3e7cd1 SHA512 546de31e1cde62b866673aedb4d3c1278213b36cc75fe86a8e759eaf16471cdefe91d6b0005b4ec4caf4316f8449717d672ede4181f1c1912f5647d50557eca9
diff --git a/dev-python/responses/files/responses-0.23.1-urllib3-2.patch b/dev-python/responses/files/responses-0.23.1-urllib3-2.patch
new file mode 100644
index 000000000000..fbe466d65707
--- /dev/null
+++ b/dev-python/responses/files/responses-0.23.1-urllib3-2.patch
@@ -0,0 +1,85 @@
+From 071306524af1b4ee1797c45a46525274d271a9b6 Mon Sep 17 00:00:00 2001
+From: Maksim Beliaev <beliaev.m.s@gmail.com>
+Date: Tue, 9 May 2023 21:14:27 +0200
+Subject: [PATCH] fix test compatibility with urllib3 (#636)
+
+- Upgrade urllib3 and requests
+---
+ CHANGES                           | 6 ++++++
+ README.rst                        | 2 +-
+ responses/tests/test_responses.py | 9 +++++----
+ setup.py                          | 4 ++--
+ 4 files changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/CHANGES b/CHANGES
+index f3a0080..f6a8d12 100644
+--- a/CHANGES
++++ b/CHANGES
+@@ -1,3 +1,9 @@
++0.23.2
++------
++
++* Updated dependency to urllib3>=2 and requests>=2.30.0. See #635
++
++
+ 0.23.1
+ ------
+ 
+diff --git a/README.rst b/README.rst
+index cfdf0b2..7d790eb 100644
+--- a/README.rst
++++ b/README.rst
+@@ -17,7 +17,7 @@ A utility library for mocking out the ``requests`` Python library.
+ 
+ ..  note::
+ 
+-    Responses requires Python 3.7 or newer, and requests >= 2.22.0
++    Responses requires Python 3.7 or newer, and requests >= 2.30.0
+ 
+ 
+ Table of Contents
+diff --git a/responses/tests/test_responses.py b/responses/tests/test_responses.py
+index 90c1d65..c264e4e 100644
+--- a/responses/tests/test_responses.py
++++ b/responses/tests/test_responses.py
+@@ -1498,9 +1498,10 @@ def test_auto_calculate_content_length_doesnt_override_existing_value():
+             headers={"Content-Length": "2"},
+             auto_calculate_content_length=True,
+         )
+-        resp = requests.get(url)
+-        assert_response(resp, "test")
+-        assert resp.headers["Content-Length"] == "2"
++        with pytest.raises(ChunkedEncodingError) as excinfo:
++            requests.get(url)
++
++        assert "IncompleteRead(4 bytes read, -2 more expected)" in str(excinfo.value)
+ 
+     run()
+     assert_reset()
+@@ -2416,7 +2417,7 @@ class TestMaxRetry:
+                 total=total,
+                 backoff_factor=0.1,
+                 status_forcelist=[500],
+-                method_whitelist=["GET", "POST", "PATCH"],
++                allowed_methods=["GET", "POST", "PATCH"],
+                 raise_on_status=raise_on_status,
+             )
+         )
+diff --git a/setup.py b/setup.py
+index 6d01ad2..f61b30a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -17,8 +17,8 @@ from setuptools.command.test import test as TestCommand
+ setup_requires = []
+ 
+ install_requires = [
+-    "requests>=2.22.0,<3.0",
+-    "urllib3>=1.25.10",
++    "requests>=2.30.0,<3.0",
++    "urllib3>=2.0.0,<3.0",
+     "pyyaml",
+     "types-PyYAML",
+     "typing_extensions; python_version < '3.8'",
+-- 
+2.40.1
+
diff --git a/dev-python/responses/responses-0.23.1-r2.ebuild b/dev-python/responses/responses-0.23.1-r2.ebuild
new file mode 100644
index 000000000000..242add7fef13
--- /dev/null
+++ b/dev-python/responses/responses-0.23.1-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="
+	https://pypi.org/project/responses/
+	https://github.com/getsentry/responses/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# tomli backend is optional now, with pyyaml being the new default.
+# However, keeping it unconditional here for backwards compatibility.
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+	<dev-python/urllib3-3[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-2.0.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/${P}-urllib3-2.patch"
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# remove unnecessary RDEP on type stubs
+	sed -i -e '/types-/d' setup.py || die
+}
+
+python_test() {
+	epytest -p no:localserver
+}