Accepting request 1065612 from home:dirkmueller:acdc

- Don't upper limit version of charset_normalizer required.

OBS-URL: https://build.opensuse.org/request/show/1065612
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests?expand=0&rev=169

python-requests.changes

@@ -1,52 +1,7 @@
 -------------------------------------------------------------------
-Sat Jan 21 10:01:11 UTC 2023 - Dirk Müller <dmueller@suse.com>
+Mon Feb 13 22:28:29 UTC 2023 - Matej Cepl <mcepl@suse.com>
 
-- update to 2.28.2:
-  - Requests now supports charset\_normalizer 3.x.
-  - Updated MissingSchema exception to suggest https scheme rather than http.
-- drop requests-allow-charset-normalizer-3.patch (upstream)
-
--------------------------------------------------------------------
-Mon Oct 31 07:43:29 UTC 2022 - David Anes <david.anes@suse.com>
-
-- allow using newest version of charset-normalizer (3.0+) 
-  * requests-allow-charset-normalizer-3.patch
-
--------------------------------------------------------------------
-Thu Sep 29 14:01:56 UTC 2022 - Dirk Müller <dmueller@suse.com>
-
-- requires python 3.7 or newer
-
--------------------------------------------------------------------
-Wed Jun 29 19:11:41 UTC 2022 - Michael Ströder <michael@stroeder.com>
-
-- rebased requests-no-hardcoded-version.patch
-- update to 2.28.1
-  * 2.28.1 (2022-06-29)
-    - Improvements
-      + Speed optimization in iter_content with transition to yield from. (#6170)
-    - Dependencies
-      + Added support for chardet 5.0.0 (#6179)
-      + Added support for charset-normalizer 2.1.0 (#6169)
-  * 2.28.0 (2022-06-09)
-    - Deprecations
-      + warning Requests has officially dropped support for Python 2.7. warning (#6091)
-      + Requests has officially dropped support for Python 3.6 (including pypy3.6). (#6091)
-    - Improvements
-      + Wrap JSON parsing issues in Request's JSONDecodeError for payloads
-        without an encoding to make json() API consistent. (#6097)
-      + Parse header components consistently, raising an InvalidHeader error in all invalid cases. (#6154)
-      + Added provisional 3.11 support with current beta build. (#6155)
-      + Requests got a makeover and we decided to paint it black. (#6095)
-    - Bugfixes
-      + Fixed bug where setting CURL_CA_BUNDLE to an empty string would disable
-        cert verification. All Requests 2.x versions before 2.28.0 are affected. (#6074)
-      + Fixed urllib3 exception leak, wrapping urllib3.exceptions.SSLError with
-        requests.exceptions.SSLError for content and iter_content. (#6057)
-      + Fixed issue where invalid Windows registry entires caused proxy resolution
-        to raise an exception rather than ignoring the entry. (#6149)
-      + Fixed issue where entire payload could be included in the error
-        message for JSONDecodeError. (#6036)
+- Don't upper limit version of charset_normalizer required.
 
 -------------------------------------------------------------------
 Wed Jan  5 17:09:11 UTC 2022 - Michael Ströder <michael@stroeder.com>

python-requests.spec

@@ -26,7 +26,7 @@
 %endif
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-requests%{psuffix}
-Version:        2.28.2
+Version:        2.27.1
 Release:        0
 Summary:        Python HTTP Library
 License:        Apache-2.0
@@ -35,8 +35,6 @@ URL:            https://docs.python-requests.org/
 Source:         https://files.pythonhosted.org/packages/source/r/requests/requests-%{version}.tar.gz
 # PATCH-FIX-SUSE: do not hardcode versions in setup.py/requirements
 Patch0:         requests-no-hardcoded-version.patch
-# PATCH-FIX-UPSTREAN: Allow charset normalizer >=2 and <4
-BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -101,6 +99,9 @@ sed -i '1s/^#!.*$//' requests/certs.py
 # requires httpbin 0.6.0
 sed -i "s#\(httpbin.*\), 'never'#\1#" tests/test_requests.py
 
+# Fix charset_normalizer requirements, we cannot do the upper limit.
+sed -i -e '/charset_normalizer/s/\~/>/' setup.py
+
 %build
 %python_build
 

requests-2.27.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61
+size 106758

requests-2.28.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf
-size 108206

requests-no-hardcoded-version.patch

@@ -1,12 +1,15 @@
-diff -ur requests-2.28.1.orig/setup.py requests-2.28.1/setup.py
---- requests-2.28.1.orig/setup.py	2022-06-29 17:09:45.000000000 +0200
-+++ requests-2.28.1/setup.py	2022-06-29 21:15:48.428104387 +0200
-@@ -65,7 +65,7 @@
-     "certifi>=2017.4.17",
+---
+ setup.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/setup.py
++++ b/setup.py
+@@ -50,7 +50,7 @@ requires = [
+ 
  ]
  test_requirements = [
--    "pytest-httpbin==0.0.7",
-+    "pytest-httpbin>=0.0.7",
-     "pytest-cov",
-     "pytest-mock",
-     "pytest-xdist",
+-    'pytest-httpbin==0.0.7',
++    'pytest-httpbin>=0.0.7',
+     'pytest-cov',
+     'pytest-mock',
+     'pytest-xdist',