浏览代码

Merge pull request #4030 from shin-/npipe-fixes

Bump docker-py dependency (includes several npipe fixes)
Joffrey F 9 年之前
父节点
当前提交
3147090fb4
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      requirements.txt
  2. 2 2
      setup.py

+ 2 - 2
requirements.txt

@@ -1,7 +1,7 @@
 PyYAML==3.11
 backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.2.0
-docker-py==1.10.3
+docker-py==1.10.4
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4; python_version < '3.4'
@@ -9,7 +9,7 @@ functools32==3.2.3.post2; python_version < '3.2'
 ipaddress==1.0.16
 jsonschema==2.5.1
 pypiwin32==219; sys_platform == 'win32'
-requests==2.7.0
+requests==2.11.1
 six==1.10.0
 texttable==0.8.4
 websocket-client==0.32.0

+ 2 - 2
setup.py

@@ -31,10 +31,10 @@ install_requires = [
     'cached-property >= 1.2.0, < 2',
     'docopt >= 0.6.1, < 0.7',
     'PyYAML >= 3.10, < 4',
-    'requests >= 2.6.1, < 2.8',
+    'requests >= 2.6.1, != 2.11.0, < 2.12',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.10.3, < 2.0',
+    'docker-py >= 1.10.4, < 2.0',
     'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',