diff --git a/Remove-tests-that-use-the-tarpit.patch b/Remove-tests-that-use-the-tarpit.patch index 3b1bcd6d6ce11fe7c5a52afd6e367a74ca3647bc..682ab245c444463a4c82097b7343e0fbb31e730c 100644 --- a/Remove-tests-that-use-the-tarpit.patch +++ b/Remove-tests-that-use-the-tarpit.patch @@ -1,4 +1,4 @@ -From 524cd22fb77e69db9bb3f017bbb1d9782c37b0cd Mon Sep 17 00:00:00 2001 +From bb1c91432c5e9a1f402692db5c80c65136656afb Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 13 Jun 2017 09:08:09 -0400 Subject: [PATCH] Remove tests that use the tarpit @@ -15,10 +15,10 @@ Signed-off-by: Jeremy Cline 1 file changed, 25 deletions(-) diff --git a/tests/test_requests.py b/tests/test_requests.py -index b8350cb..46b7e9e 100755 +index 7d4a4eb5..8d1c55fc 100644 --- a/tests/test_requests.py +++ b/tests/test_requests.py -@@ -2049,31 +2049,6 @@ class TestTimeout: +@@ -2186,31 +2186,6 @@ class TestTimeout: except ReadTimeout: pass @@ -48,8 +48,8 @@ index b8350cb..46b7e9e 100755 - pass - def test_encoded_methods(self, httpbin): - """See: https://github.com/requests/requests/issues/2316""" + """See: https://github.com/psf/requests/issues/2316""" r = requests.request(b'GET', httpbin('get')) -- -2.9.4 +2.24.1 diff --git a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch index 6cb71da9404a9107e9dfd055e2b6013a10b6cd1e..3ff962ff7d1889823570e96431069872bd6c4281 100644 --- a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch +++ b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch @@ -1,9 +1,25 @@ -diff -uNrp a/requests/certs.py b/requests/certs.py ---- a/requests/certs.py 2019-12-20 15:17:38.304000000 +0800 -+++ b/requests/certs.py 2019-12-20 15:25:18.952000000 +0800 -@@ -11,7 +11,10 @@ If you are packaging Requests, e.g., for +From aad5590d5ea47dc54cfd97da54f2640014f7d39d Mon Sep 17 00:00:00 2001 +From: Jeremy Cline +Date: Thu, 13 Dec 2018 10:55:29 -0500 +Subject: [PATCH] Patch requests/certs.py to use the system CA bundle + +Signed-off-by: Jeremy Cline +--- + requests/certs.py | 8 +++++++- + setup.py | 1 - + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/requests/certs.py b/requests/certs.py +index d1a378d7..5eb2f1a9 100644 +--- a/requests/certs.py ++++ b/requests/certs.py +@@ -11,8 +11,14 @@ only one — the one from the certifi package. + If you are packaging Requests, e.g., for a Linux distribution or a managed environment, you can change the definition of where() to return a separately packaged CA bundle. ++ ++This Fedora-patched package returns "/etc/pki/tls/certs/ca-bundle.crt" provided ++by the ca-certificates RPM package. """ -from certifi import where +def where(): @@ -13,14 +29,18 @@ diff -uNrp a/requests/certs.py b/requests/certs.py if __name__ == '__main__': print(where()) -diff -uNrp a/setup.py b/setup.py ---- a/setup.py 2019-12-20 15:17:38.304000000 +0800 -+++ b/setup.py 2019-12-20 15:14:39.212000000 +0800 +diff --git a/setup.py b/setup.py +index 2da9ba07..851d9a42 100755 +--- a/setup.py ++++ b/setup.py @@ -45,7 +45,6 @@ requires = [ - 'chardet>=3.0.2,<3.1.0', - 'idna>=2.5,<2.9', - 'urllib3>=1.21.1,<1.25', + 'chardet>=3.0.2,<4', + 'idna>=2.5,<3', + 'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1', - 'certifi>=2017.4.17' ] test_requirements = [ +-- +2.24.1 + diff --git a/python-requests.spec b/python-requests.spec index e825790707eaccadeff3e07284adf1906ada06ee..79974d1eb9d62b10ce481e44ea57ef25667a331e 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,8 +1,8 @@ %bcond_with tests Name: python-requests -Version: 2.21.0 -Release: 5 +Version: 2.23.0 +Release: 1 Summary: Python HTTP Library License: ASL 2.0 URL: http://python-requests.org/ @@ -113,6 +113,12 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %doc HISTORY.md README.md %changelog +* Tue Jan 30 2020 fuyangqing - 2.23.0-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: updata to 2.23.0 + * Sat Jan 11 2020 openEuler Buildteam - 2.21.0-5 - Type:enhancement - ID:NA diff --git a/requests-v2.21.0.tar.gz b/requests-v2.23.0.tar.gz similarity index 52% rename from requests-v2.21.0.tar.gz rename to requests-v2.23.0.tar.gz index 45f2b3d4ce03ead08f7ddd241748ece87226b409..9a5b60934b98f2161f4de0d8a387445acddb3f04 100644 Binary files a/requests-v2.21.0.tar.gz and b/requests-v2.23.0.tar.gz differ