!19 update to 2.26.0

From: @kerongw
Reviewed-by: @zengwefeng
Signed-off-by: @zengwefeng

backport-Remove-tests-that-use-the-tarpit.patch

@@ -10,6 +10,9 @@ tests depend on the connection not being killed immediately and that
 they are never responded to.
  
 Signed-off-by: Jeremy Cline <jeremy@jcline.org>
+
+Reference:
+https://src.fedoraproject.org/rpms/python-requests/blob/rawhide/f/Remove-tests-that-use-the-tarpit.patch
 ---
 diff -Naur requests-2.24.0/tests/test_requests.py requests-2/tests/test_requests.py
 --- requests-2.24.0/tests/test_requests.py      2020-08-04 18:05:14.250000000 +0800

backport-patch-requests-certs.py-to-use-the-system-CA-bundle.patch

@@ -0,0 +1,41 @@
+From cc1b9954ca7dcd90a694f7e2e9990c883bf7b647 Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Wed, 21 Jul 2021 12:05:53 +0200
+Subject: [PATCH] patch-requests-certs.py-to-use-the-system-CA-bundle
+
+Reference:
+https://src.fedoraproject.org/rpms/python-requests/blob/rawhide/f/patch-requests-certs.py-to-use-the-system-CA-bundle.patch
+---
+diff --git a/requests/certs.py b/requests/certs.py
+index a14a7ee..a1841ca 100644
+--- a/requests/certs.py
++++ b/requests/certs.py
+@@ -10,8 +10,12 @@ 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.
+-"""
+-from certifi import where
+
++This OpenEuler-patched package returns "/etc/pki/tls/certs/ca-bundle.crt" provided
++by the ca-certificates RPM package.
++"""
++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 --git a/setup.py b/setup.py
+index ce5e5c8..de86a91 100755
+--- a/setup.py
++++ b/setup.py
+@@ -46,7 +46,6 @@ requires = [
+     'idna>=2.5,<3; python_version < "3"',
+     'idna>=2.5,<4; python_version >= "3"',
+     'urllib3>=1.21.1,<1.27',
+-    'certifi>=2017.4.17'
+
+ ]
+ test_requirements = [
+--
+2.27.0

backport-requests-2.12.4-tests_nonet.patch

@@ -1,3 +1,5 @@
+Reference:
+https://src.fedoraproject.org/rpms/python-requests/blob/rawhide/f/requests-2.12.4-tests_nonet.patch
 --- requests-2.12.4/tests/testserver/server.py	2016-12-21 11:31:56.000000000 -0800
 +++ requests-2.12.4/tests/testserver/server.py.new	2016-12-30 10:40:06.085995065 -0800
 @@ -27,7 +27,7 @@

patch-requests-certs.py-to-use-the-system-CA-bundle.patch

@@ -1,29 +0,0 @@
-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 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 --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,<5',
-     'idna>=2.5,<3',
-     'urllib3>=1.21.1,<1.27',
--    'certifi>=2017.4.17'
- 
- ]
- test_requirements = [

python-requests.spec

@@ -1,17 +1,16 @@
 %bcond_with tests
 
 Name:           python-requests
-Version:        2.25.1
+Version:        2.26.0
 Release:        1
 Summary:        Python HTTP Library
 License:        ASL 2.0
 URL:            http://python-requests.org/
-Source0:        https://github.com/psf/requests/archive/v%{version}.tar.gz
+Source0:        https://github.com/psf/requests/archive/refs/tags/v%{version}.tar.gz
 
-Patch1:         requests-2.12.4-tests_nonet.patch
-Patch2:         requests-2.20.0-no-py2-httpbin.patch
-Patch3:         patch-requests-certs.py-to-use-the-system-CA-bundle.patch
-Patch4:         Remove-tests-that-use-the-tarpit.patch 
+Patch6001:         backport-requests-2.12.4-tests_nonet.patch
+Patch6002:         backport-patch-requests-certs.py-to-use-the-system-CA-bundle.patch
+Patch6003:         backport-Remove-tests-that-use-the-tarpit.patch
 
 BuildArch:      noarch
 
@@ -41,6 +40,7 @@ BuildRequires:   python%{python3_pkgversion}-devel
 BuildRequires:   python%{python3_pkgversion}-chardet
 BuildRequires:   python%{python3_pkgversion}-urllib3
 BuildRequires:   python%{python3_pkgversion}-idna
+
 %if %{with tests}
 BuildRequires:   python%{python3_pkgversion}-pytest
 BuildRequires:   python%{python3_pkgversion}-pytest-cov
@@ -78,20 +78,22 @@ sed -i '/#!\/usr\/.*python/d' requests/certs.py
 %if %{with tests}
 %check
 PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v
-%endif # tests
+%endif 
 
-%files -n python%{python3_pkgversion}-requests
+%files -n python%{python3_pkgversion}-requests 
 %defattr(-,root,root)
 %license LICENSE
-%{python3_sitelib}/*.egg-info
+%{python3_sitelib}/*.egg-info/*
 %{python3_sitelib}/requests/
 
-
 %files    help
 %defattr(-,root,root)
 %doc HISTORY.md README.md
 
 %changelog
+* Sat Dec 04 2021 wangkerong <wangkerong@huawei.com> - 2.26.0-1
+- update to 2.26.0
+
 * Thu Feb 4 2021 chengguipeng <chengguipeng1@huawei.com> - 2.25.1-1
 - update to 2.25.1
 

requests-2.20.0-no-py2-httpbin.patch

@@ -1,34 +0,0 @@
-diff --git a/tests/conftest.py b/tests/conftest.py
-index cd64a76..1d5ddbb 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -14,11 +14,23 @@ def prepare_url(value):
-     return inner
- 
- 
--@pytest.fixture
--def httpbin(httpbin):
--    return prepare_url(httpbin)
-+import sys
- 
-+if sys.version_info[0] < 3:
-+    @pytest.fixture
-+    def httpbin():
-+        pytest.skip('No httpbin for Python 2')
- 
--@pytest.fixture
--def httpbin_secure(httpbin_secure):
--    return prepare_url(httpbin_secure)
-+    @pytest.fixture
-+    def httpbin_secure():
-+        pytest.skip('No httpbin for Python 2')
-+
-+else:
-+    @pytest.fixture
-+    def httpbin(httpbin):
-+        return prepare_url(httpbin)
-+
-+
-+    @pytest.fixture
-+    def httpbin_secure(httpbin_secure):
-+        return prepare_url(httpbin_secure)