From 721b527fe8df9df1256499ff035dae1edeb1275f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 10 2019 10:48:35 +0000 Subject: import python-urllib3-1.23-7.1.module+el8.0.0+4028+a686efca --- diff --git a/SOURCES/urllib3-delay-timebomb.patch b/SOURCES/urllib3-delay-timebomb.patch deleted file mode 100644 index 3d0690f..0000000 --- a/SOURCES/urllib3-delay-timebomb.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naurp a/test/test_connection.py b/test/test_connection.py ---- a/test/test_connection.py 2018-06-05 03:18:52.000000000 +0000 -+++ b/test/test_connection.py 2019-07-31 11:01:10.025593879 +0000 -@@ -51,5 +51,5 @@ class TestConnection(object): - # doesn't get too far behind what the current date is. - # When this test fails update urllib3.connection.RECENT_DATE - # according to the rules defined in that file. -- two_years = datetime.timedelta(days=365 * 2) -- assert RECENT_DATE > (datetime.datetime.today() - two_years).date() -+ five_years = datetime.timedelta(days=365 * 5) -+ assert RECENT_DATE > (datetime.datetime.today() - five_years).date() diff --git a/SPECS/python-urllib3.spec b/SPECS/python-urllib3.spec index 5de5bbf..37fc745 100644 --- a/SPECS/python-urllib3.spec +++ b/SPECS/python-urllib3.spec @@ -4,7 +4,7 @@ Name: python-%{srcname} Version: 1.23 -Release: 7%{?dist} +Release: 7.1%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -14,8 +14,6 @@ Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz Source1: ssl_match_hostname_py3.py BuildArch: noarch -Patch1: urllib3-delay-timebomb.patch - %description Python HTTP module with connection pooling and file POST abilities. @@ -66,9 +64,6 @@ Python3 HTTP module with connection pooling and file POST abilities. %prep %setup -q -n %{srcname}-%{version} - -%patch1 -p1 - # Drop the dummyserver tests in koji. # These require tornado, a Web framework otherwise unused in the distro. rm -rf test/with_dummyserver/ @@ -80,6 +75,15 @@ rm -rf test/appengine/ # to do with Fedora in particular. They don't fail in upstream build infrastructure rm -rf test/contrib/ +# Test `test_recent_date` fails if RECENT_DATE is not up to date. +# Comment from the test: +# This test is to make sure that the RECENT_DATE value +# doesn't get too far behind what the current date is. +# When this test fails update urllib3.connection.RECENT_DATE +# according to the rules defined in that file. +sed -i "s/^RECENT_DATE = datetime.date(2017, 6, 30)$/RECENT_DATE = datetime.date(2019, 2, 19)/" \ + urllib3/connection.py + %build %py2_build %if %{with python3} @@ -143,6 +147,9 @@ py.test-3 %changelog +* Tue Aug 20 2019 Tomas Orsava - 1.23-7.1 +- Update the RECENT_DATE variable that needs to be kept up-to-date + * Wed Apr 03 2019 Tomas Orsava - 1.23-7 - Bumping due to problems with modular RPM upgrade path (#1695587) - Related: rhbz#1693974