Bladeren bron

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 <[email protected]>

Joffrey F 8 jaren geleden
bovenliggende
commit
abd395a5f3
2 gewijzigde bestanden met toevoegingen van 15 en 8 verwijderingen
  1. 14 8
      requirements.txt
  2. 1 0
      setup.py

+ 14 - 8
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

+ 1 - 0
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'],
 }