From c07296cec45c11196a235253d92b53036d5a3af6 Mon Sep 17 00:00:00 2001 From: Jon Clucas Date: Wed, 13 Apr 2022 12:43:59 -0400 Subject: [PATCH] :wrench: Add '--cleanenv' to default Singularity flags --- .github/workflows/test_cpac.yml | 4 ++-- src/cpac/backends/singularity.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_cpac.yml b/.github/workflows/test_cpac.yml index df4be269..74928caf 100644 --- a/.github/workflows/test_cpac.yml +++ b/.github/workflows/test_cpac.yml @@ -19,11 +19,11 @@ jobs: strategy: matrix: - platform: [docker] + platform: [docker, singularity] tag: [latest, nightly] go: [1.14] python: [3.7, 3.8, 3.9, "3.10"] - singularity: [3.6.4] + singularity: [3.6.4, 3.7, 3.8] steps: - uses: actions/checkout@v2 diff --git a/src/cpac/backends/singularity.py b/src/cpac/backends/singularity.py index ac766ded..2ad42f43 100644 --- a/src/cpac/backends/singularity.py +++ b/src/cpac/backends/singularity.py @@ -19,7 +19,8 @@ def __init__(self, **kwargs): self.pull(**kwargs, force=False) self.options = list(chain.from_iterable(kwargs[ "container_options" - ])) if bool(kwargs.get("container_options")) else [] + ])) if bool(kwargs.get("container_options")) else [ + '--cleanenv'] if isinstance(self.pipeline_config, str): self.config = Client.execute( image=self.image,