From 7f7c2177c877a900d229e53fc099cba3964fff1a Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 15 Oct 2019 15:21:53 +0000 Subject: [PATCH 1/5] Update to v1.25.6 --- .gitignore | 1 + 1614.patch | 20 -------------------- 1645.patch | 31 ------------------------------- python-urllib3.spec | 15 ++++++++------- sources | 2 +- 5 files changed, 10 insertions(+), 59 deletions(-) delete mode 100644 1614.patch delete mode 100644 1645.patch diff --git a/.gitignore b/.gitignore index e579ed7..7191c96 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /urllib3-1.24.2.tar.gz /urllib3-1.25.2.tar.gz /urllib3-1.25.3.tar.gz +/urllib3-1.25.6.tar.gz diff --git a/1614.patch b/1614.patch deleted file mode 100644 index 3f7d2ef..0000000 --- a/1614.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 8d82ecab638ef1cafbbf0007d597a4d9d23656ba Mon Sep 17 00:00:00 2001 -From: Ratan Kulshreshtha -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/1645.patch b/1645.patch deleted file mode 100644 index 41f7435..0000000 --- a/1645.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 19b02fee383647ede591c0368e6ac437c832b871 Mon Sep 17 00:00:00 2001 -From: Seth Michael Larson -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 - diff --git a/python-urllib3.spec b/python-urllib3.spec index 652bfe7..4759c9a 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -4,8 +4,13 @@ %bcond_without tests Name: python-%{srcname} +<<<<<<< HEAD Version: 1.25.3 Release: 4%{?dist} +======= +Version: 1.25.6 +Release: 1%{?dist} +>>>>>>> 5787270... Update to v1.25.6 Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -15,13 +20,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. @@ -141,6 +139,9 @@ popd %changelog +* Tue Oct 15 2019 Jeremy Cline - 1.25.6-1 +- Update to v1.25.6 + * Fri Jul 26 2019 Fedora Release Engineering - 1.25.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index e6b3029..228c9cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.25.3.tar.gz) = 86556d486c5aac9c3c7875d1440317c3be3924f67f4377a99e15892a39f532330d07f9dec5c5a1ed8b20957d2c611e78a97bd9d1684acff3069cd7debbbaa001 +SHA512 (urllib3-1.25.6.tar.gz) = 02457492406fff3a61143d695df8304fc66a31f2646ca05ccacd9f2e5f86560e4c68a1f7f4702d6402b9d4d899145b15b125e56b3bc273012b0306ca4d0d7927 From 74bf0663547ae3a4f6cea107cfbe7690acb0e523 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 15 Oct 2019 15:23:48 +0000 Subject: [PATCH 2/5] Actually factually resolve the conflict --- python-urllib3.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 4759c9a..0075c27 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -4,13 +4,8 @@ %bcond_without tests Name: python-%{srcname} -<<<<<<< HEAD -Version: 1.25.3 -Release: 4%{?dist} -======= Version: 1.25.6 Release: 1%{?dist} ->>>>>>> 5787270... Update to v1.25.6 Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT From c4923bf2ff66828ea5b452207bb77d00566d456d Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 15 Oct 2019 15:32:16 +0000 Subject: [PATCH 3/5] Buildrequire on python2-setuptools? --- python-urllib3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-urllib3.spec b/python-urllib3.spec index 0075c27..4e8e454 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -34,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. From 552aad09e029132d5b7d3f2e284a6c63bf1c116f Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 13 Nov 2019 10:37:15 -0500 Subject: [PATCH 4/5] Update to 1.25.7 --- .gitignore | 1 + python-urllib3.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7191c96..19cdadc 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /urllib3-1.25.2.tar.gz /urllib3-1.25.3.tar.gz /urllib3-1.25.6.tar.gz +/urllib3-1.25.7.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 4e8e454..eb55c8a 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -4,7 +4,7 @@ %bcond_without tests Name: python-%{srcname} -Version: 1.25.6 +Version: 1.25.7 Release: 1%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post diff --git a/sources b/sources index 228c9cb..f8dfc21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.25.6.tar.gz) = 02457492406fff3a61143d695df8304fc66a31f2646ca05ccacd9f2e5f86560e4c68a1f7f4702d6402b9d4d899145b15b125e56b3bc273012b0306ca4d0d7927 +SHA512 (urllib3-1.25.7.tar.gz) = bbf55a1d46fe799b98c311bdb47628c14719d5b3ae00fb27515da774d8f7c043ff79a9684f12b133101574527531d4a79134fe67e28dad518d429e55f82e0c59 From f4a058bac355a6c150d43f67439d290c2c4bc819 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 13 Nov 2019 10:43:08 -0500 Subject: [PATCH 5/5] Depend on trustme for tests --- python-urllib3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-urllib3.spec b/python-urllib3.spec index eb55c8a..62a83c0 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -51,6 +51,7 @@ BuildRequires: python3-six BuildRequires: python3-pysocks BuildRequires: python3-pytest BuildRequires: python3-tornado +BuildRequires: python3-trustme BuildRequires: python3-idna %endif