diff --git a/.gitignore b/.gitignore index 4d3cbe1..0ba5f58 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /requests-2.12.3.tar.gz /requests-2.12.4.tar.gz /requests-2.12.4-tests.tar.gz +/requests-v2.13.0.tar.gz diff --git a/python-requests-urllib3-at-1.19.1.patch b/python-requests-urllib3-at-1.19.1.patch deleted file mode 100644 index e556bfa..0000000 --- a/python-requests-urllib3-at-1.19.1.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 417c2b103a7c4be9dcc2072d9c6c61e687fbe657 Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -Date: Thu, 17 Nov 2016 17:02:22 -0500 -Subject: [PATCH] python requests urllib3 at 1.19.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 c240624..bfadfb9 100755 ---- a/setup.py -+++ b/setup.py -@@ -46,7 +46,7 @@ packages = [ - 'requests.packages.urllib3.packages.backports', - ] - --requires = [] -+requires = ['urllib3==1.19.1'] - test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov'] - - with open('requests/__init__.py', 'r') as fd: --- -2.9.3 - diff --git a/python-requests-urllib3-at-1.20.patch b/python-requests-urllib3-at-1.20.patch new file mode 100644 index 0000000..dc832e8 --- /dev/null +++ b/python-requests-urllib3-at-1.20.patch @@ -0,0 +1,26 @@ +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.spec b/python-requests.spec index 8865e2f..59be994 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -7,22 +7,16 @@ %{!?python3_pkgversion: %global python3_pkgversion 34} %endif -%global urllib3_unbundled_version 1.19.1 +%global urllib3_unbundled_version 1.20 Name: python-requests -Version: 2.12.4 -Release: 3%{?dist} +Version: 2.13.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 URL: https://pypi.io/project/requests -Source0: https://pypi.io/packages/source/r/requests/requests-%{version}.tar.gz -# To generate: -# git clone https://github.com/kennethreitz/requests.git -# cd requests -# git checkout v%{version} -# tar cvzf requests-%{version}-tests.tar.gz tests/ -Source1: requests-2.12.4-tests.tar.gz +Source0: https://github.com/kennethreitz/requests/archive/v%{version}/requests-v%{version}.tar.gz # Explicitly use the system certificates in ca-certificates. # https://bugzilla.redhat.com/show_bug.cgi?id=904614 Patch0: python-requests-system-cert-bundle.patch @@ -110,7 +104,7 @@ designed to make HTTP requests easy for developers. %endif %prep -%setup -q -n requests-%{version} -a 1 +%setup -q -n requests-%{version} %patch0 -p1 %patch1 -p1 @@ -190,6 +184,9 @@ popd %endif %changelog +* Thu Feb 09 2017 Jeremy Cline - 2.13.0-1 +- Update to 2.13.0 (#1418138) + * Fri Dec 30 2016 Adam Williamson - 2.12.4-3 - Include and enable tests (now python-pytest-httpbin is packaged) diff --git a/sources b/sources index 5d71558..f94ea47 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (requests-2.12.4.tar.gz) = 100a38ad4bfe5c02c44ccfa75473da4b58416690985117750a0c2e1851e98267df740f578f6a5ad27d0a5b9de2954988f832ea1a169fffc82e8e2da15742f855 -SHA512 (requests-2.12.4-tests.tar.gz) = baeaa07a61c05ea6dd3f1b26225d77e1532434b7de2cad1a22e5d71eda546a2dffd49fcaa8beccc1694eccf2c69f545290c9fc48e2f0e24dc208b7eac41c920f +SHA512 (requests-v2.13.0.tar.gz) = d39d0a50b05940175f0a6b7383d98c6882e28ccb23f84f25b3adc7527fa162f767dde02a67a11e82dc90e8482bd0d60c0efd8f27a73231e39d9b01b9e1d191b1