From 6d76eb58d239f35e31d84ec094e50d67d8d157fc Mon Sep 17 00:00:00 2001 From: Remi Gau Date: Thu, 15 Aug 2024 13:10:04 +0200 Subject: [PATCH] run precommit --- neurodocker/cli/tests/test_build_images_with_cli.py | 11 +++++++---- neurodocker/reproenv/renderers.py | 2 +- neurodocker/templates/gentoo.yaml | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/neurodocker/cli/tests/test_build_images_with_cli.py b/neurodocker/cli/tests/test_build_images_with_cli.py index f9fe473f..71ac83fe 100644 --- a/neurodocker/cli/tests/test_build_images_with_cli.py +++ b/neurodocker/cli/tests/test_build_images_with_cli.py @@ -33,7 +33,7 @@ # TODO: make it work -- seems has difficulty installing jq, # may be curl isn't there or alike # ("portage", "gentoo"), - ], + ], ) def test_build_image_from_registered( tmp_path: Path, cmd: str, pkg_manager: str, base_image: str @@ -133,9 +133,12 @@ def test_gentoo_image(tmp_path: Path): generate, [ cmd, - "--pkg-manager", "portage", - "--base-image", "gentoo", - "--install", "app-misc/mime-types", + "--pkg-manager", + "portage", + "--base-image", + "gentoo", + "--install", + "app-misc/mime-types", ], ) assert result.exit_code == 0, result.output diff --git a/neurodocker/reproenv/renderers.py b/neurodocker/reproenv/renderers.py index 4cec9ceb..0d4429fe 100644 --- a/neurodocker/reproenv/renderers.py +++ b/neurodocker/reproenv/renderers.py @@ -528,7 +528,7 @@ def from_(self, base_image: str, as_: str = None) -> DockerRenderer: # TODO: figure out hashes for the date # s += "ARG gentoo_hash=2d25617a1d085316761b06c17a93ec972f172fc6\n" # s += "ARG science_hash=73916dd3680ffd92e5bd3d32b262e5d78c86a448\n" - s += "ARG FEATURES=\"-ipc-sandbox -network-sandbox -pid-sandbox\"\n" + s += 'ARG FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox"\n' else: if as_ is None: s = "FROM " + base_image diff --git a/neurodocker/templates/gentoo.yaml b/neurodocker/templates/gentoo.yaml index 0ae27c1c..62a7426c 100644 --- a/neurodocker/templates/gentoo.yaml +++ b/neurodocker/templates/gentoo.yaml @@ -11,8 +11,8 @@ binaries: something: not-used arguments: optional: - gentoo_hash: "282c4b518562e6c194761d9ce0882f30672219c5" - science_hash: "e4579f5851734f245b02cc1e98f3b69d9df67e09" + gentoo_hash: 282c4b518562e6c194761d9ce0882f30672219c5 + science_hash: e4579f5851734f245b02cc1e98f3b69d9df67e09 # Below echo commands will be indented by _indent_run_instruction which # would cause trailing spaces to be added to the files. But it should be ok # for us, thus we are not bothering to workaround via inlining.