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