From 29cefd379ab3575f7cffc3b44525f66988d23ea9b7e8430f4e7510066fd5905c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sat, 25 May 2019 08:45:30 +0000
Subject: [PATCH] - Update to 2.22.0:   * Requests now supports urllib3
 v1.25.2. (note: 1.25.0 and 1.25.1 are incompatible) - Rebase
 requests-no-hardcoded-version.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests?expand=0&rev=130
---
 python-requests.changes             | 7 +++++++
 python-requests.spec                | 2 +-
 requests-2.21.0.tar.gz              | 3 ---
 requests-2.22.0.tar.gz              | 3 +++
 requests-no-hardcoded-version.patch | 8 ++++----
 5 files changed, 15 insertions(+), 8 deletions(-)
 delete mode 100644 requests-2.21.0.tar.gz
 create mode 100644 requests-2.22.0.tar.gz

diff --git a/python-requests.changes b/python-requests.changes
index 1c5b20a..9ff191d 100644
--- a/python-requests.changes
+++ b/python-requests.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat May 25 08:41:20 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Update to 2.22.0:
+  * Requests now supports urllib3 v1.25.2. (note: 1.25.0 and 1.25.1 are incompatible)
+- Rebase requests-no-hardcoded-version.patch
+
 -------------------------------------------------------------------
 Tue Apr 23 10:45:08 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-requests.spec b/python-requests.spec
index 864adc2..39a3ec9 100644
--- a/python-requests.spec
+++ b/python-requests.spec
@@ -26,7 +26,7 @@
 %endif
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-requests%{psuffix}
-Version:        2.21.0
+Version:        2.22.0
 Release:        0
 Summary:        Python HTTP Library
 License:        Apache-2.0
diff --git a/requests-2.21.0.tar.gz b/requests-2.21.0.tar.gz
deleted file mode 100644
index 7d389f5..0000000
--- a/requests-2.21.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e
-size 111528
diff --git a/requests-2.22.0.tar.gz b/requests-2.22.0.tar.gz
new file mode 100644
index 0000000..39bacc5
--- /dev/null
+++ b/requests-2.22.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4
+size 113406
diff --git a/requests-no-hardcoded-version.patch b/requests-no-hardcoded-version.patch
index bd3968b..26d0cd1 100644
--- a/requests-no-hardcoded-version.patch
+++ b/requests-no-hardcoded-version.patch
@@ -1,14 +1,14 @@
-Index: requests-2.21.0/setup.py
+Index: requests-2.22.0/setup.py
 ===================================================================
---- requests-2.21.0.orig/setup.py
-+++ requests-2.21.0/setup.py
+--- requests-2.22.0.orig/setup.py
++++ requests-2.22.0/setup.py
 @@ -42,14 +42,14 @@ if sys.argv[-1] == 'publish':
  packages = ['requests']
  
  requires = [
 -    'chardet>=3.0.2,<3.1.0',
 -    'idna>=2.5,<2.9',
--    'urllib3>=1.21.1,<1.25',
+-    'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1',
 +    'chardet>=3.0.2',
 +    'idna>=2.5',
 +    'urllib3>=1.21.1',