tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #997 from abesto/use-latest-docker-py 

Use docker-py 1.0.0
This commit is contained in:
Aanand Prasad 2015-03-02 14:15:18 +00:00
parent db3b4731cd 8f38b28816
commit 8610adcaf3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -1,5 +1,5 @@
PyYAML==3.10
docker-py==0.7.1
docker-py==1.0.0
dockerpty==0.3.2
docopt==0.6.1
requests==2.2.1

2
setup.py
View File

@ -30,7 +30,7 @@ install_requires = [
'requests >= 2.2.1, < 2.5.0',
'texttable >= 0.8.1, < 0.9',
'websocket-client >= 0.11.0, < 1.0',
'docker-py >= 0.6.0, < 0.8',
'docker-py >= 1.0.0, < 1.1.0',
'dockerpty >= 0.3.2, < 0.4',
'six >= 1.3.0, < 2',
]

2
tests/unit/cli/docker_client_test.py
View File

@ -19,4 +19,4 @@ class DockerClientTestCase(unittest.TestCase):
with mock.patch.dict(os.environ):
os.environ['DOCKER_CLIENT_TIMEOUT'] = timeout = "300"
client = docker_client.docker_client()
self.assertEqual(client._timeout, int(timeout))
self.assertEqual(client.timeout, int(timeout))