Depend on trustme for tests

.gitignore

@@ -25,3 +25,5 @@
 /urllib3-1.24.2.tar.gz
 /urllib3-1.25.2.tar.gz
 /urllib3-1.25.3.tar.gz
+/urllib3-1.25.6.tar.gz
+/urllib3-1.25.7.tar.gz

1614.patch

@@ -1,20 +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
-@@ -20,5 +20,5 @@ requires-dist =
-     PySocks>=1.5.6,<2.0,!=1.5.7; extra == 'socks'
-     brotlipy>=0.6.0; extra == 'brotli'
- 
--[pytest]
-+[tool:pytest]
- xfail_strict = true

1645.patch

@@ -1,31 +0,0 @@
-From 19b02fee383647ede591c0368e6ac437c832b871 Mon Sep 17 00:00:00 2001
-From: Seth Michael Larson <sethmichaellarson@gmail.com>
-Date: Tue, 2 Jul 2019 23:08:27 -0500
-Subject: [PATCH] Update RECENT_DATE to 2019-1-1
-
----
- src/urllib3/connection.py | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/src/urllib3/connection.py b/src/urllib3/connection.py
-index 57c58fe..96f5d28 100644
---- a/src/urllib3/connection.py
-+++ b/src/urllib3/connection.py
-@@ -56,11 +56,9 @@ port_by_scheme = {
-     'https': 443,
- }
- 
--# 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, 1, 1)
- 
- 
- class DummyConnection(object):
--- 
-2.21.0
-

python-urllib3.spec

@@ -4,8 +4,8 @@
 %bcond_without tests
 
 Name:           python-%{srcname}
-Version:        1.25.3
-Release:        4%{?dist}
+Version:        1.25.7
+Release:        1%{?dist}
 Summary:        Python HTTP library with thread-safe connection pooling and file post
 
 License:        MIT
@@ -15,13 +15,6 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 Source1:        ssl_match_hostname_py3.py
 BuildArch:      noarch
 
-# Merged upstream, compatibility with latest pytest
-Patch0:         1614.patch
-
-# Merged upstream, set RECENT_DATE not to be older than 2 years
-# https://bugzilla.redhat.com/show_bug.cgi?id=1727796
-Patch1:         1645.patch
-
 %description
 Python HTTP module with connection pooling and file POST abilities.
 
@@ -41,6 +34,7 @@ Requires:       python2-ipaddress
 Requires:       python2-pysocks
 
 BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
 
 %description -n python2-%{srcname}
 Python2 HTTP module with connection pooling and file POST abilities.
@@ -57,6 +51,7 @@ BuildRequires:  python3-six
 BuildRequires:  python3-pysocks
 BuildRequires:  python3-pytest
 BuildRequires:  python3-tornado
+BuildRequires:  python3-trustme
 BuildRequires:  python3-idna
 %endif
 
@@ -141,6 +136,9 @@ popd
 
 
 %changelog
+* Tue Oct 15 2019 Jeremy Cline <jcline@redhat.com> - 1.25.6-1
+- Update to v1.25.6
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.25.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (urllib3-1.25.3.tar.gz) = 86556d486c5aac9c3c7875d1440317c3be3924f67f4377a99e15892a39f532330d07f9dec5c5a1ed8b20957d2c611e78a97bd9d1684acff3069cd7debbbaa001
+SHA512 (urllib3-1.25.7.tar.gz) = bbf55a1d46fe799b98c311bdb47628c14719d5b3ae00fb27515da774d8f7c043ff79a9684f12b133101574527531d4a79134fe67e28dad518d429e55f82e0c59