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 #2031 from aanand/docker-py-1.4.0 

Update docker-py to 1.4.0
This commit is contained in:
mnowster 2015-09-15 15:31:52 +01:00
parent 1bef5cd166 d1dd06a7e2
commit e33ab0cdd8
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==1.3.1
docker-py==1.4.0
dockerpty==0.3.4
docopt==0.6.1
enum34==1.0.4

2
setup.py
View File

@ -33,7 +33,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.3.1, < 1.4',
'docker-py >= 1.4.0, < 2',
'dockerpty >= 0.3.4, < 0.4',
'six >= 1.3.0, < 2',
'jsonschema >= 2.5.1, < 3',

2
tests/integration/service_test.py
View File

@ -864,7 +864,7 @@ class ServiceTest(DockerClientTestCase):
def test_log_drive_invalid(self):
service = self.create_service('web', log_driver='xxx')
self.assertRaises(ValueError, lambda: create_and_start_container(service))
self.assertRaises(APIError, lambda: create_and_start_container(service))
def test_log_drive_empty_default_jsonfile(self):
service = self.create_service('web')