From 36f013907836ebd7ce1396948a67087ef59329f4 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: May 17 2017 17:10:52 +0000 Subject: Update to 2.14.2 (#1449432) Signed-off-by: Jeremy Cline --- diff --git a/.gitignore b/.gitignore index 0ba5f58..45f6d88 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /requests-2.12.4.tar.gz /requests-2.12.4-tests.tar.gz /requests-v2.13.0.tar.gz +/requests-v2.14.2.tar.gz diff --git a/python-requests-urllib3-at-1.20.patch b/python-requests-urllib3-at-1.20.patch deleted file mode 100644 index dc832e8..0000000 --- a/python-requests-urllib3-at-1.20.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 46c751c2b8423038863cd619b8301a9f6df8570d Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -Date: Thu, 19 Jan 2017 10:41:21 -0500 -Subject: [PATCH] Update setup.py for urllib3 at 1.20 - -Signed-off-by: Jeremy Cline ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index b162348..daf4a23 100755 ---- a/setup.py -+++ b/setup.py -@@ -46,7 +46,7 @@ packages = [ - 'requests.packages.urllib3.packages.backports', - ] - --requires = [] -+requires = ['urllib3==1.20'] - test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock'] - - with open('requests/__init__.py', 'r') as fd: --- -2.9.3 - diff --git a/python-requests-urllib3-at-1.21.1.patch b/python-requests-urllib3-at-1.21.1.patch new file mode 100644 index 0000000..fb44c99 --- /dev/null +++ b/python-requests-urllib3-at-1.21.1.patch @@ -0,0 +1,26 @@ +From e44b99214a953fcc68227a7182f2fecd55c58267 Mon Sep 17 00:00:00 2001 +From: Jeremy Cline +Date: Wed, 17 May 2017 11:57:23 -0400 +Subject: [PATCH] python requests urllib3 at 1.21.1 + +Signed-off-by: Jeremy Cline +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 6ad0bc3..50ae1a1 100755 +--- a/setup.py ++++ b/setup.py +@@ -48,7 +48,7 @@ packages = [ + 'requests.packages.urllib3.contrib._securetransport', + ] + +-requires = [] ++requires = ['urllib3==1.21.1'] + test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock'] + + with open('requests/__init__.py', 'r') as fd: +-- +2.9.4 + diff --git a/python-requests.spec b/python-requests.spec index 59be994..26ec3bd 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -7,10 +7,10 @@ %{!?python3_pkgversion: %global python3_pkgversion 34} %endif -%global urllib3_unbundled_version 1.20 +%global urllib3_unbundled_version 1.21.1 Name: python-requests -Version: 2.13.0 +Version: 2.14.2 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings @@ -104,12 +104,7 @@ designed to make HTTP requests easy for developers. %endif %prep -%setup -q -n requests-%{version} - -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 -n requests-%{version} # Unbundle the certificate bundle from mozilla. rm -rf requests/cacert.pem @@ -184,6 +179,10 @@ popd %endif %changelog +* Wed May 17 2017 Jeremy Cline - 2.14.2-1 +- Update to 2.14.2 (#1449432) +- Switch to autosetup to apply patches + * Thu Feb 09 2017 Jeremy Cline - 2.13.0-1 - Update to 2.13.0 (#1418138) diff --git a/sources b/sources index f94ea47..58b0080 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.13.0.tar.gz) = d39d0a50b05940175f0a6b7383d98c6882e28ccb23f84f25b3adc7527fa162f767dde02a67a11e82dc90e8482bd0d60c0efd8f27a73231e39d9b01b9e1d191b1 +SHA512 (requests-v2.14.2.tar.gz) = a9f2b612bbfc4ce27c9a96bfac052f01329f2adbde7f188ee5507419f73252f282ebe68616df93a8c32680998c85ee7adf683893801df24439de8f0ed02af0a2