Merge pull request #3192 from shin-/use-dockerpy-1.8

Require docker-py 1.8.0rc2
2016-03-24 13:55:59 -04:00 · 2016-03-24 13:55:59 -04:00 · d1d8df7f72
parent d78b013bb0 60470fb9f1
commit d1d8df7f72
2 changed files with 2 additions and 2 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -1,9 +1,9 @@
 PyYAML==3.11
 cached-property==1.2.0
+docker-py==1.8.0rc2
 dockerpty==0.4.1
 docopt==0.6.1
 enum34==1.0.4
-git+https://github.com/docker/docker-py.git@5c1c42397cf0fdb74182df2d69822b82df8f2a6a#egg=docker-py
 jsonschema==2.5.1
 requests==2.7.0
 six==1.7.3
--- a/setup.py
+++ b/setup.py
@ -34,7 +34,7 @@ install_requires = [
    'requests >= 2.6.1, < 2.8',
    'texttable >= 0.8.1, < 0.9',
    'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.7.0, < 2',
+    'docker-py > 1.7.2, < 2',
    'dockerpty >= 0.4.1, < 0.5',
    'six >= 1.3.0, < 2',
    'jsonschema >= 2.5.1, < 3',