From af182bd3cca710680fb941d7fff7029071e3316f Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Mon, 3 Jul 2017 15:32:22 -0700 Subject: [PATCH] Add 'socks' extra to help with proxy environment. SOCKS support will be included in the bundled (binary) version Update some packages in requirements.txt and add some implicit deps Signed-off-by: Joffrey F --- requirements.txt | 22 ++++++++++++++-------- setup.py | 1 + 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4d506b9f4..844921ffd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,22 @@ -PyYAML==3.11 +PySocks==1.6.7 +PyYAML==3.12 backports.ssl-match-hostname==3.5.0.1; python_version < '3' -cached-property==1.2.0 -colorama==0.3.7 +cached-property==1.3.0 +certifi==2017.4.17 +chardet==3.0.4 +colorama==0.3.9 docker==2.4.2 +docker-pycreds==0.2.1 dockerpty==0.4.1 -docopt==0.6.1 -enum34==1.0.4; python_version < '3.4' +docopt==0.6.2 +enum34==1.1.6; python_version < '3.4' functools32==3.2.3.post2; python_version < '3.2' -ipaddress==1.0.16 -jsonschema==2.5.1 +idna==2.5 +ipaddress==1.0.18 +jsonschema==2.6.0 pypiwin32==219; sys_platform == 'win32' requests==2.11.1 six==1.10.0 -texttable==0.8.4 +texttable==0.8.8 +urllib3==1.21.1 websocket-client==0.32.0 diff --git a/setup.py b/setup.py index 0d5bd6adc..dab7a6eea 100644 --- a/setup.py +++ b/setup.py @@ -56,6 +56,7 @@ extras_require = { ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], ':python_version < "3.3"': ['ipaddress >= 1.0.16'], + 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], }