From 12b59ccefdcfd70d2d370e3cd9537292d3a87b0a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 15:53:07 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .docker/README.md | 2 +- .../base-with-services/s6-assets/s6-rc.d/postgresql/down | 2 +- .../s6-assets/s6-rc.d/postgresql/timeout-up | 2 +- .../base-with-services/s6-assets/s6-rc.d/postgresql/type | 2 +- .docker/dodo.py | 3 ++- .docker/tests/conftest.py | 6 +++--- .docker/tests/test_aiida.py | 1 + 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.docker/README.md b/.docker/README.md index eff9622d8d..81c74e43de 100644 --- a/.docker/README.md +++ b/.docker/README.md @@ -13,4 +13,4 @@ You can specify target stacks to build with `--target`, example: `doit build --t ### Trigger a build on ghcr.io and dockerhub Only the PR open to the organization repository will trigger a build on ghcr.io. -Push to dockerhub is triggered when making a release on github. \ No newline at end of file +Push to dockerhub is triggered when making a release on github. diff --git a/.docker/base-with-services/s6-assets/s6-rc.d/postgresql/down b/.docker/base-with-services/s6-assets/s6-rc.d/postgresql/down index 5c13ca93d9..f2cc3c69b8 100644 --- a/.docker/base-with-services/s6-assets/s6-rc.d/postgresql/down +++ b/.docker/base-with-services/s6-assets/s6-rc.d/postgresql/down @@ -1 +1 @@ -pg_ctl -D /home/aiida/.postgresql stop \ No newline at end of file +pg_ctl -D /home/aiida/.postgresql stop diff --git a/.docker/base-with-services/s6-assets/s6-rc.d/postgresql/timeout-up b/.docker/base-with-services/s6-assets/s6-rc.d/postgresql/timeout-up index c227083464..573541ac97 100644 --- a/.docker/base-with-services/s6-assets/s6-rc.d/postgresql/timeout-up +++ b/.docker/base-with-services/s6-assets/s6-rc.d/postgresql/timeout-up @@ -1 +1 @@ -0 \ No newline at end of file +0 diff --git a/.docker/base-with-services/s6-assets/s6-rc.d/postgresql/type b/.docker/base-with-services/s6-assets/s6-rc.d/postgresql/type index 3d92b15f2d..bdd22a1850 100644 --- a/.docker/base-with-services/s6-assets/s6-rc.d/postgresql/type +++ b/.docker/base-with-services/s6-assets/s6-rc.d/postgresql/type @@ -1 +1 @@ -oneshot \ No newline at end of file +oneshot diff --git a/.docker/dodo.py b/.docker/dodo.py index 56e182f6dd..a86ef95de2 100644 --- a/.docker/dodo.py +++ b/.docker/dodo.py @@ -83,7 +83,8 @@ def generate_version_override(version, registry, targets, architecture, organiza ORGANIZATION=organization, PLATFORMS=platforms, ) - ), encoding='utf-8', + ), + encoding='utf-8', ) return { diff --git a/.docker/tests/conftest.py b/.docker/tests/conftest.py index 50238f5ddf..e8980c7e64 100644 --- a/.docker/tests/conftest.py +++ b/.docker/tests/conftest.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# pylint: disable=missing-module-docstring, redefined-outer-name +# pylint: disable=missing-docstring, redefined-outer-name import json from pathlib import Path @@ -12,7 +12,7 @@ def variant(request): @pytest.fixture(scope='session') -def docker_compose_file(pytestconfig, variant): # pylint: unused-argument +def docker_compose_file(pytestconfig, variant): # pylint: disable=unused-argument return f'docker-compose.{variant}.yml' @@ -34,7 +34,7 @@ def container_user(): @pytest.fixture -def aiida_exec(docker_compose): +def aiida_exec(docker_compose): def execute(command, user=None, **kwargs): if user: diff --git a/.docker/tests/test_aiida.py b/.docker/tests/test_aiida.py index d5dadb89c8..dc636fa695 100644 --- a/.docker/tests/test_aiida.py +++ b/.docker/tests/test_aiida.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +# pylint: disable=missing-docstring import json import time