0001-Strip-up-generic-versions-and-bump-requests.patch 2.0 KB

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