Update from 1.24.3 to 1.25.9

0001-Connection-Update-RECENT_DATE-to-2019-9-1.patch

@@ -1,20 +0,0 @@
-diff --git a/urllib3-1.24.3/src/urllib3/connection.py b/urllib3-1.24.3/src/urllib3/connection.py
-index ba269b7..5384094 100644
---- a/src/urllib3/connection.py
-+++ b/src/urllib3/connection.py
-@@ -57,10 +57,9 @@ port_by_scheme = {
- 
- # When updating RECENT_DATE, move it to within two years of the current date,
- # and not less than 6 months ago.
--# Example: if Today is 2018-01-01, then RECENT_DATE should be any date on or
--# after 2016-01-01 (today - 2 years) AND before 2017-07-01 (today - 6 months)
--RECENT_DATE = datetime.date(2017, 6, 30)
--
-+# When it comes time to update this value as a part of regular maintenance
-+# (ie test_recent_date is failing) update it to ~6 months before the current date.
-+RECENT_DATE = datetime.date(2019, 9, 1)
- 
- class DummyConnection(object):
-     """Used to detect a failed ConnectionCls import."""
--- 
-2.19.1

modify-pytest-tool.patch

@@ -1,19 +0,0 @@
-From 8d82ecab638ef1cafbbf0007d597a4d9d23656ba Mon Sep 17 00:00:00 2001
-From: Ratan Kulshreshtha <ratan.shreshtha@gmail.com>
-Date: Thu, 23 May 2019 23:27:37 +0530
-Subject: [PATCH] Update assertions to pytest style
- 
----
- setup.cfg                                     |   2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
- 
-diff --git a/setup.cfg b/setup.cfg
-index ddda086a0..dbd367b86 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -19,4 +19,4 @@ requires-dist =
-     PySocks>=1.5.6,<2.0,!=1.5.7; extra == 'socks'
- 
--[pytest]
-+[tool:pytest]
- xfail_strict = true

python-urllib3.spec

@@ -2,16 +2,13 @@
 %bcond_without tests
 
 Name:           python-%{srcname}
-Version:        1.24.3
-Release:        2
+Version:        1.25.9
+Release:        1
 Summary:        Sanity-friendly HTTP client for Python
 License:        MIT
 URL:            https://urllib3.readthedocs.io
 Source0:        https://github.com/urllib3/urllib3/archive/%{version}/urllib3-%{version}.tar.gz
 Source1:        ssl_match_hostname_py3.py
-#modify pytest to tool:pytest, from Ratan Kulshreshtha <ratan.shreshtha@gmail.com>
-Patch0:         modify-pytest-tool.patch
-Patch6000:      0001-Connection-Update-RECENT_DATE-to-2019-9-1.patch
 
 BuildArch:      noarch
 
@@ -32,7 +29,7 @@ Requires:       python2-ipaddress python2-pysocks
 BuildRequires:  python2-devel
 
 %if %{with tests}
-BuildRequires:  python2-nose python2-coverage python2-mock python2-six
+BuildRequires:  python2-nose python2-coverage python2-mock python2-six python-trustme
 BuildRequires:  python2-pysocks python2-pytest python2-tornado python2-backports-ssl_match_hostname
 %endif
 
@@ -110,6 +107,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pyt
 %{python3_sitelib}/urllib3-*.egg-info
 
 %changelog
+* Wed 25 Nov 2020 leiju<leiju4@huawei.com> - 1.25.9-1
+- upgrade to 1.25.9
+
 * Sat Oct 26 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.24.3-2
 - optimize spec file.