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

Fix Flake8 lint

Browse Source 
This removes extra indentation and replace the use of `is` by `==` when
comparing strings

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
This commit is contained in:
Ulysses Souza 2019-01-30 14:28:00 +01:00 committed by Christopher Crone
parent f472fd545b
commit c8a621b637
2 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
compose/service.py
View File

@ -291,7 +291,7 @@ class Service(object):
c for c in stopped_containers if self._containers_have_diverged([c]) c for c in stopped_containers if self._containers_have_diverged([c])
] ]
for c in divergent_containers: for c in divergent_containers:
c.remove() c.remove()
all_containers = list(set(all_containers) - set(divergent_containers)) all_containers = list(set(all_containers) - set(divergent_containers))
@ -467,50 +467,50 @@ class Service(object):
def _execute_convergence_recreate(self, containers, scale, timeout, detached, start, def _execute_convergence_recreate(self, containers, scale, timeout, detached, start,
renew_anonymous_volumes): renew_anonymous_volumes):
if scale is not None and len(containers) > scale: if scale is not None and len(containers) > scale:
self._downscale(containers[scale:], timeout) self._downscale(containers[scale:], timeout)
containers = containers[:scale] containers = containers[:scale]
def recreate(container): def recreate(container):
return self.recreate_container( return self.recreate_container(
container, timeout=timeout, attach_logs=not detached, container, timeout=timeout, attach_logs=not detached,
start_new_container=start, renew_anonymous_volumes=renew_anonymous_volumes start_new_container=start, renew_anonymous_volumes=renew_anonymous_volumes
)
containers, errors = parallel_execute(
containers,
recreate,
lambda c: c.name,
"Recreating",
) )
containers, errors = parallel_execute(
containers,
recreate,
lambda c: c.name,
"Recreating",
)
for error in errors.values():
raise OperationFailedError(error)
if scale is not None and len(containers) < scale:
containers.extend(self._execute_convergence_create(
scale - len(containers), detached, start
))
return containers
def _execute_convergence_start(self, containers, scale, timeout, detached, start):
if scale is not None and len(containers) > scale:
self._downscale(containers[scale:], timeout)
containers = containers[:scale]
if start:
_, errors = parallel_execute(
containers,
lambda c: self.start_container_if_stopped(c, attach_logs=not detached, quiet=True),
lambda c: c.name,
"Starting",
)
for error in errors.values(): for error in errors.values():
raise OperationFailedError(error) raise OperationFailedError(error)
if scale is not None and len(containers) < scale: if scale is not None and len(containers) < scale:
containers.extend(self._execute_convergence_create( containers.extend(self._execute_convergence_create(
scale - len(containers), detached, start scale - len(containers), detached, start
)) ))
return containers return containers
def _execute_convergence_start(self, containers, scale, timeout, detached, start):
if scale is not None and len(containers) > scale:
self._downscale(containers[scale:], timeout)
containers = containers[:scale]
if start:
_, errors = parallel_execute(
containers,
lambda c: self.start_container_if_stopped(c, attach_logs=not detached, quiet=True),
lambda c: c.name,
"Starting",
)
for error in errors.values():
raise OperationFailedError(error)
if scale is not None and len(containers) < scale:
containers.extend(self._execute_convergence_create(
scale - len(containers), detached, start
))
return containers
def _downscale(self, containers, timeout=None): def _downscale(self, containers, timeout=None):
def stop_and_remove(container): def stop_and_remove(container):

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

@ -193,7 +193,7 @@ class TestConsumeQueue(object):
queue.put(item) queue.put(item)
generator = consume_queue(queue, True) generator = consume_queue(queue, True)
assert next(generator) is 'foobar-1' assert next(generator) == 'foobar-1'
def test_item_is_none_when_timeout_is_hit(self): def test_item_is_none_when_timeout_is_hit(self):
queue = Queue() queue = Queue()