tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 12:44:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bump python SDK to 3.0.0

Browse Source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-01-31 18:54:58 -08:00
parent 520fad331f
commit d8d484e0e1
6 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/container.py
View File

@ -243,7 +243,7 @@ class Container(object):
self.inspect() self.inspect()
def wait(self): def wait(self):
return self.client.wait(self.id) return self.client.wait(self.id).get('StatusCode', 127)
def logs(self, *args, **kwargs): def logs(self, *args, **kwargs):
return self.client.logs(self.id, *args, **kwargs) return self.client.logs(self.id, *args, **kwargs)

1
compose/service.py
View File

@ -972,7 +972,6 @@ class Service(object):
build_output = self.client.build( build_output = self.client.build(
path=path, path=path,
tag=self.image_name, tag=self.image_name,
stream=True,
rm=True, rm=True,
forcerm=force_rm, forcerm=force_rm,
pull=pull, pull=pull,

2
requirements.txt
View File

@ -2,7 +2,7 @@ backports.ssl-match-hostname==3.5.0.1; python_version < '3'
cached-property==1.3.0 cached-property==1.3.0
certifi==2017.4.17 certifi==2017.4.17
chardet==3.0.4 chardet==3.0.4
docker==2.7.0 docker==3.0.0
docker-pycreds==0.2.1 docker-pycreds==0.2.1
dockerpty==0.4.1 dockerpty==0.4.1
docopt==0.6.2 docopt==0.6.2

2
setup.py
View File

@ -36,7 +36,7 @@ install_requires = [
'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19', 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19',
'texttable >= 0.9.0, < 0.10', 'texttable >= 0.9.0, < 0.10',
'websocket-client >= 0.32.0, < 1.0', 'websocket-client >= 0.32.0, < 1.0',
'docker >= 2.7.0, < 3.0', 'docker >= 3.0.0, < 4.0',
'dockerpty >= 0.4.1, < 0.5', 'dockerpty >= 0.4.1, < 0.5',
'six >= 1.3.0, < 2', 'six >= 1.3.0, < 2',
'jsonschema >= 2.5.1, < 3', 'jsonschema >= 2.5.1, < 3',

2
tests/helpers.py
View File

@ -32,7 +32,7 @@ def create_custom_host_file(client, filename, content):
) )
try: try:
client.start(container) client.start(container)
exitcode = client.wait(container) exitcode = client.wait(container)['StatusCode']
if exitcode != 0: if exitcode != 0:
output = client.logs(container) output = client.logs(container)

2
tests/unit/service_test.py
View File

@ -470,7 +470,6 @@ class ServiceTest(unittest.TestCase):
self.mock_client.build.assert_called_once_with( self.mock_client.build.assert_called_once_with(
tag='default_foo', tag='default_foo',
dockerfile=None, dockerfile=None,
stream=True,
path='.', path='.',
pull=False, pull=False,
forcerm=False, forcerm=False,
@ -513,7 +512,6 @@ class ServiceTest(unittest.TestCase):
self.mock_client.build.assert_called_once_with( self.mock_client.build.assert_called_once_with(
tag='default_foo', tag='default_foo',
dockerfile=None, dockerfile=None,
stream=True,
path='.', path='.',
pull=False, pull=False,
forcerm=False, forcerm=False,