python-requests:update to 2.25.1

Signed-off-by: chengguipeng <chengguipeng1@huawei.com>
This commit is contained in:
chengguipeng 2021-02-04 16:43:58 +08:00
parent 186a082423
commit 3d2e7f5eab
3 changed files with 17 additions and 20 deletions

View File

@ -1,36 +1,29 @@
From aad5590d5ea47dc54cfd97da54f2640014f7d39d Mon Sep 17 00:00:00 2001 diff --color -Nur requests-2.25.1.orig/requests/certs.py requests-2.25.1/requests/certs.py
From: Jeremy Cline <jcline@redhat.com> --- requests-2.25.1.orig/requests/certs.py 2021-01-10 16:27:05.027059634 -0800
Date: Thu, 13 Dec 2018 10:55:29 -0500 +++ requests-2.25.1/requests/certs.py 2021-01-10 16:29:06.973238179 -0800
Subject: [PATCH] Patch requests/certs.py to use the system CA bundle
Signed-off-by: Jeremy Cline <jcline@redhat.com>
---
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
@@ -10,8 +10,13 @@ @@ -10,8 +10,13 @@
If you are packaging Requests, e.g., for a Linux distribution or a managed 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 environment, you can change the definition of where() to return a separately
packaged CA bundle. 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. +by the ca-certificates RPM package.
""" """
-from certifi import where -from certifi import where
+def where(): +def where():
+ """Return the absolute path to the system CA bundle.""" + """Return the absolute path to the system CA bundle."""
+ return '/etc/pki/tls/certs/ca-bundle.crt' + return '/etc/pki/tls/certs/ca-bundle.crt'
if __name__ == '__main__': if __name__ == '__main__':
print(where()) print(where())
diff -Naur requests-2.24.0/setup.py requests-1/setup.py diff --color -Nur requests-2.25.1.orig/setup.py requests-2.25.1/setup.py
--- requests-2.24.0/setup.py 2020-08-04 18:05:14.250000000 +0800 --- requests-2.25.1.orig/setup.py 2020-12-16 11:34:26.000000000 -0800
+++ requests-1/setup.py 2020-08-04 18:07:46.508000000 +0800 +++ requests-2.25.1/setup.py 2021-01-10 16:29:21.570259552 -0800
@@ -45,7 +45,6 @@ @@ -45,7 +45,6 @@
'chardet>=3.0.2,<4', 'chardet>=3.0.2,<5',
'idna>=2.5,<3', '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' - 'certifi>=2017.4.17'
] ]
test_requirements = [ test_requirements = [

View File

@ -1,8 +1,8 @@
%bcond_with tests %bcond_with tests
Name: python-requests Name: python-requests
Version: 2.24.0 Version: 2.25.1
Release: 3 Release: 1
Summary: Python HTTP Library Summary: Python HTTP Library
License: ASL 2.0 License: ASL 2.0
URL: http://python-requests.org/ URL: http://python-requests.org/
@ -51,6 +51,7 @@ BuildRequires: python%{python3_pkgversion}-pytest-mock
Requires: python%{python3_pkgversion}-chardet Requires: python%{python3_pkgversion}-chardet
Requires: python%{python3_pkgversion}-urllib3 Requires: python%{python3_pkgversion}-urllib3
Requires: python%{python3_pkgversion}-idna Requires: python%{python3_pkgversion}-idna
Requires: ca-certificates
%description -n python%{python3_pkgversion}-requests %description -n python%{python3_pkgversion}-requests
Requests is an ISC Licensed HTTP library, written in Python, for human 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 %doc HISTORY.md README.md
%changelog %changelog
* Thu Feb 4 2021 chengguipeng <chengguipeng1@huawei.com> - 2.25.1-1
- update to 2.25.1
* Wed Oct 14 2020 shangyibin <shangyibin1@huawei.com> - 2.24.0-3 * Wed Oct 14 2020 shangyibin <shangyibin1@huawei.com> - 2.24.0-3
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA

Binary file not shown.