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 739bf5c8b4674a9fe9118736e6488b51e8156e2b..5568feeae55faff08b76407b3049e250bbcf927b 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,36 +1,29 @@ -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 ---- -diff -Naur requests-2.24.0/requests/certs.py requests-1/requests/certs.py ---- requests-2.24.0/requests/certs.py 2020-08-04 18:05:14.250000000 +0800 -+++ requests-1/requests/certs.py 2020-08-04 18:07:20.652000000 +0800 +diff --color -Nur requests-2.25.1.orig/requests/certs.py requests-2.25.1/requests/certs.py +--- requests-2.25.1.orig/requests/certs.py 2021-01-10 16:27:05.027059634 -0800 ++++ requests-2.25.1/requests/certs.py 2021-01-10 16:29:06.973238179 -0800 @@ -10,8 +10,13 @@ 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 ++This OpenEuler-patched package returns "/etc/pki/tls/certs/ca-bundle.crt" provided +by the ca-certificates RPM package. """ -from certifi import where +def where(): + """Return the absolute path to the system CA bundle.""" + return '/etc/pki/tls/certs/ca-bundle.crt' - + if __name__ == '__main__': print(where()) -diff -Naur requests-2.24.0/setup.py requests-1/setup.py ---- requests-2.24.0/setup.py 2020-08-04 18:05:14.250000000 +0800 -+++ requests-1/setup.py 2020-08-04 18:07:46.508000000 +0800 +diff --color -Nur requests-2.25.1.orig/setup.py requests-2.25.1/setup.py +--- requests-2.25.1.orig/setup.py 2020-12-16 11:34:26.000000000 -0800 ++++ requests-2.25.1/setup.py 2021-01-10 16:29:21.570259552 -0800 @@ -45,7 +45,6 @@ - 'chardet>=3.0.2,<4', + 'chardet>=3.0.2,<5', 'idna>=2.5,<3', - 'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1', + 'urllib3>=1.21.1,<1.27', - 'certifi>=2017.4.17' - + ] test_requirements = [ diff --git a/python-requests.spec b/python-requests.spec index 75096770caed59792f6016c1e35cd85937fc1de7..43b0e4365118345f46bb5e60c1db81c6d9cb0026 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,8 +1,8 @@ %bcond_with tests Name: python-requests -Version: 2.24.0 -Release: 3 +Version: 2.25.1 +Release: 1 Summary: Python HTTP Library License: ASL 2.0 URL: http://python-requests.org/ @@ -51,6 +51,7 @@ BuildRequires: python%{python3_pkgversion}-pytest-mock Requires: python%{python3_pkgversion}-chardet Requires: python%{python3_pkgversion}-urllib3 Requires: python%{python3_pkgversion}-idna +Requires: ca-certificates %description -n python%{python3_pkgversion}-requests Requests is an ISC Licensed HTTP library, written in Python, for human @@ -91,6 +92,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %doc HISTORY.md README.md %changelog +* Thu Feb 4 2021 chengguipeng - 2.25.1-1 +- update to 2.25.1 + * Wed Oct 14 2020 shangyibin - 2.24.0-3 - Type:bugfix - ID:NA diff --git a/v2.24.0.tar.gz b/v2.25.1.tar.gz similarity index 58% rename from v2.24.0.tar.gz rename to v2.25.1.tar.gz index b8a95154a62f127257a169543a3e4074e284ad22..ab62d59efc91c4475ca724ea964607b112d9330b 100644 Binary files a/v2.24.0.tar.gz and b/v2.25.1.tar.gz differ