From 17996d6c19c30000bb6791bb96b1c413f8765680 Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: Tue, 28 May 2019 12:10:56 -0400
Subject: [PATCH] Update to v1.25.3

Pulls in an upstreamed (but unreleased) patch for the tests to work
with the latest pytest.
---
 .gitignore          |  2 ++
 1614.patch          | 20 ++++++++++++++++++++
 python-urllib3.spec | 12 +++++++++++-
 sources             |  2 +-
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 1614.patch

diff --git a/.gitignore b/.gitignore
index 10a86e0..e579ed7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@
 /urllib3-1.24.tar.gz
 /urllib3-1.24.1.tar.gz
 /urllib3-1.24.2.tar.gz
+/urllib3-1.25.2.tar.gz
+/urllib3-1.25.3.tar.gz
diff --git a/1614.patch b/1614.patch
new file mode 100644
index 0000000..3f7d2ef
--- /dev/null
+++ b/1614.patch
@@ -0,0 +1,20 @@
+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
diff --git a/python-urllib3.spec b/python-urllib3.spec
index aa433e8..9877801 100644
--- a/python-urllib3.spec
+++ b/python-urllib3.spec
@@ -4,7 +4,7 @@
 %bcond_without tests
 
 Name:           python-%{srcname}
-Version:        1.24.2
+Version:        1.25.3
 Release:        1%{?dist}
 Summary:        Python HTTP library with thread-safe connection pooling and file post
 
@@ -15,6 +15,9 @@ 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
+
 %description
 Python HTTP module with connection pooling and file POST abilities.
 
@@ -29,6 +32,7 @@ Requires:       python2-six
 Requires:       python2-backports-ssl_match_hostname
 
 # Secure extra requirements
+Requires:       python2-idna
 Requires:       python2-ipaddress
 Requires:       python2-pysocks
 
@@ -43,6 +47,7 @@ BuildRequires:  python2-six
 BuildRequires:  python2-pysocks
 BuildRequires:  python2-pytest
 BuildRequires:  python2-tornado
+BuildRequires:  python2-idna
 %endif
 
 %description -n python2-%{srcname}
@@ -60,9 +65,11 @@ BuildRequires:  python3-six
 BuildRequires:  python3-pysocks
 BuildRequires:  python3-pytest
 BuildRequires:  python3-tornado
+BuildRequires:  python3-idna
 %endif
 
 Requires:       ca-certificates
+Requires:       python3-idna
 Requires:       python3-six
 Requires:       python3-pysocks
 
@@ -143,6 +150,9 @@ popd
 
 
 %changelog
+* Tue May 28 2019 Jeremy Cline <jcline@redhat.com> - 1.25.3-1
+- Update to 1.25.3
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 360033c..e6b3029 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (urllib3-1.24.2.tar.gz) = 08e8d896f57eb9af5511d07002859f87f2a7bddbd5e66468908188dfe13d2e3985a8cdd2da12d06d0b337945ca8314c1f026d4e82badf23a09bf686fa121e863
+SHA512 (urllib3-1.25.3.tar.gz) = 86556d486c5aac9c3c7875d1440317c3be3924f67f4377a99e15892a39f532330d07f9dec5c5a1ed8b20957d2c611e78a97bd9d1684acff3069cd7debbbaa001