Accepting request 1088655 from devel:languages:python

- Drop patch 636-urllib3-2-compat.patch:
  * moto needs to stay with urllib3 < 2 due to boto.

OBS-URL: https://build.opensuse.org/request/show/1088655
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-responses?expand=0&rev=27
This commit is contained in:
Dominique Leuenberger 2023-05-30 20:02:02 +00:00 committed by Git OBS Bridge
commit 891ed4ad2e
3 changed files with 9 additions and 74 deletions

View File

@ -1,68 +0,0 @@
---
CHANGES | 6 ++++++
README.rst | 2 +-
responses/tests/test_responses.py | 9 +++++----
setup.py | 4 ++--
4 files changed, 14 insertions(+), 7 deletions(-)
--- 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
------
--- a/README.rst
+++ b/README.rst
@@ -17,7 +17,7 @@ A utility library for mocking out the ``
.. 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
--- a/responses/tests/test_responses.py
+++ b/responses/tests/test_responses.py
@@ -1498,9 +1498,10 @@ def test_auto_calculate_content_length_d
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,
)
)
--- a/setup.py
+++ b/setup.py
@@ -17,8 +17,8 @@ from setuptools.command.test import test
setup_requires = []
install_requires = [
- "requests>=2.22.0,<3.0",
- "urllib3>=1.25.10",
+ "requests>=2.23.0,<3.0",
+ "urllib3>=2.0.0,<3.0",
"pyyaml",
"types-PyYAML",
"typing_extensions; python_version < '3.8'",

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 23 12:47:08 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
- Drop patch 636-urllib3-2-compat.patch:
* moto needs to stay with urllib3 < 2 due to boto.
-------------------------------------------------------------------
Tue May 9 22:20:25 UTC 2023 - Matej Cepl <mcepl@suse.com>

View File

@ -22,12 +22,9 @@ Version: 0.23.1
Release: 0
Summary: A utility library for mocking out the `requests` Python library
License: Apache-2.0
Group: Development/Languages/Python
URL: https://github.com/getsentry/responses
Source: https://files.pythonhosted.org/packages/source/r/responses/responses-%{version}.tar.gz
# PATCH-FIX-UPSTREAM 636-urllib3-2-compat.patch gh#getsentry/responses!636 mcepl@suse.com
# Make the package compatible with urllib3 >= 2.0
Patch0: 636-urllib3-2-compat.patch
# Waiting for the death of urllib3 1.x due to boto: gh#getsentry/responses!636
# PATCH-FIX-UPSTREAM unbundle-urllib3.patch gh#getsentry/responses#635, mcepl@suse.com
# Don't use urllib3 bundled in requests.
Patch1: unbundle-urllib3.patch
@ -44,10 +41,10 @@ BuildRequires: %{python_module pytest-httpserver}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module requests >= 2.22 with %python-requests < 3}
BuildRequires: %{python_module tomli-w}
BuildRequires: %{python_module urllib3 >= 2}
BuildRequires: %{python_module urllib3 < 2}
# /SECTION
Requires: python-PyYAML
Requires: python-urllib3 >= 2
Requires: python-urllib3 < 2
Requires: (python-requests >= 2.22.0 with python-requests < 3)
BuildArch: noarch
%python_subpackages