From 5c716db2b63239c79d6b7085427004b5963b3e5c Mon Sep 17 00:00:00 2001 From: Olivier Date: Thu, 31 Dec 2020 20:52:16 +0000 Subject: [PATCH] Antilint --- scone/default/recipes/docker.py | 7 +++++-- scone/default/steps/filesystem_steps.py | 1 - scone/default/utensils/docker_utensils.py | 10 ++++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/scone/default/recipes/docker.py b/scone/default/recipes/docker.py index ef29996..af30358 100644 --- a/scone/default/recipes/docker.py +++ b/scone/default/recipes/docker.py @@ -1,8 +1,10 @@ from scone.default.utensils.docker_utensils import ( + ContainerState, DockerContainerRun, + DockerContainerState, DockerImagePull, DockerNetworkCreate, - DockerVolumeCreate, DockerContainerState, ContainerState, + DockerVolumeCreate, ) from scone.head.kitchen import Kitchen from scone.head.recipe import Recipe, RecipeContext @@ -26,7 +28,8 @@ class DockerContainer(Recipe): if current_state == ContainerState.NOTFOUND: await kitchen.ut1areq( - DockerContainerRun(self.image, self.command, self.name), DockerContainerRun.Result + DockerContainerRun(self.image, self.command, self.name), + DockerContainerRun.Result, ) diff --git a/scone/default/steps/filesystem_steps.py b/scone/default/steps/filesystem_steps.py index 906caba..000851b 100644 --- a/scone/default/steps/filesystem_steps.py +++ b/scone/default/steps/filesystem_steps.py @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with Scone. If not, see . -from scone.default.utensils.basic_utensils import HashFile from scone.head.kitchen import Kitchen diff --git a/scone/default/utensils/docker_utensils.py b/scone/default/utensils/docker_utensils.py index 2619305..7ce9760 100644 --- a/scone/default/utensils/docker_utensils.py +++ b/scone/default/utensils/docker_utensils.py @@ -21,7 +21,9 @@ def _docker_client(): if not docker: # check docker is actually installed and give a message with the resolution # when it isn't. - raise RuntimeError("You need to install docker from PyPI to use these utensils!") + raise RuntimeError( + "You need to install docker from PyPI to use these utensils!" + ) global _docker_client_instance if not _docker_client_instance: @@ -48,11 +50,11 @@ class DockerContainerState(Utensil): for container in client.containers.list(all=True): container: Container if self.name == container.name: - if container.status == 'running': + if container.status == "running": await channel.send(ContainerState.RUNNING) - elif container.status == 'exited': + elif container.status == "exited": await channel.send(ContainerState.EXITED) - elif container.status == 'restarting': + elif container.status == "restarting": await channel.send(ContainerState.RESTARTING) else: raise ValueError(f"Unknown container status: {container.status}")