1From 2bb1a267aba3ca5fe414d0f79192def668c18bab Mon Sep 17 00:00:00 2001
2From: Ulysses Souza <ulysses.souza@docker.com>
3Date: Tue, 2 Jul 2019 15:49:07 +0200
4Subject: [PATCH] Strip up generic versions and bump requests
5
6Replaces generic limitations with a next major value
7Bump the minimal `requests` to 2.20.0
8
9Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
10(cherry picked from commit ce5451c5b4a3b449ce703168d2a568b0a4d25ee6)
11Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
12---
13 setup.py | 24 ++++++++++++------------
14 1 file changed, 12 insertions(+), 12 deletions(-)
15
16diff --git a/setup.py b/setup.py
17index 8371cc75..61447801 100644
18--- a/setup.py
19+++ b/setup.py
20@@ -31,31 +31,31 @@ def find_version(*file_paths):
21
22 install_requires = [
23     'cached-property >= 1.2.0, < 2',
24-    'docopt >= 0.6.1, < 0.7',
25-    'PyYAML >= 3.10, < 4.3',
26-    'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21',
27-    'texttable >= 0.9.0, < 0.10',
28-    'websocket-client >= 0.32.0, < 1.0',
29-    'docker[ssh] >= 3.7.0, < 4.0',
30-    'dockerpty >= 0.4.1, < 0.5',
31+    'docopt >= 0.6.1, < 1',
32+    'PyYAML >= 3.10, < 5',
33+    'requests >= 2.20.0, < 3',
34+    'texttable >= 0.9.0, < 1',
35+    'websocket-client >= 0.32.0, < 1',
36+    'docker[ssh] >= 3.7.0, < 5',
37+    'dockerpty >= 0.4.1, < 1',
38     'six >= 1.3.0, < 2',
39     'jsonschema >= 2.5.1, < 3',
40 ]
41
42
43 tests_require = [
44-    'pytest',
45+    'pytest < 6',
46 ]
47
48
49 if sys.version_info[:2] < (3, 4):
50-    tests_require.append('mock >= 1.0.1')
51+    tests_require.append('mock >= 1.0.1, < 2')
52
53 extras_require = {
54     ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
55-    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
56-    ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
57-    ':sys_platform == "win32"': ['colorama >= 0.4, < 0.5'],
58+    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
59+    ':python_version < "3.3"': ['ipaddress >= 1.0.16, < 2'],
60+    ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
61     'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
62 }
63
64--
652.20.1
66
67