replace CWL_SINGULARITY_CACHE by CWL_SINGULARITY_IMAGES

Author: natthan-pigoux

conformance-test.sh

@@ -65,8 +65,8 @@ elif [ "${CONTAINER}" == "docker" ]; then
 elif [ "${CONTAINER}" == "podman" ]; then
     podman pull docker.io/node:slim
 elif [ "${CONTAINER}" == "singularity" ]; then
-    export CWL_SINGULARITY_CACHE="$SCRIPT_DIRECTORY/sifcache"
-    mkdir --parents "${CWL_SINGULARITY_CACHE}"
+    export CWL_SINGULARITY_IMAGES="$SCRIPT_DIRECTORY/sifcache"
+    mkdir --parents "${CWL_SINGULARITY_IMAGES}"
 fi
 
 # Setup environment

tests/test_docker.py

@@ -185,7 +185,7 @@ def test_podman_required_secfile(tmp_path: Path) -> None:
 def test_singularity_required_secfile(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
     singularity_dir = tmp_path / "singularity"
     singularity_dir.mkdir()
-    monkeypatch.setenv("CWL_SINGULARITY_CACHE", str(singularity_dir))
+    monkeypatch.setenv("CWL_SINGULARITY_IMAGES", str(singularity_dir))
 
     result_code, stdout, stderr = get_main_output(
         [
@@ -247,7 +247,7 @@ def test_singularity_required_missing_secfile(
 ) -> None:
     singularity_dir = tmp_path / "singularity"
     singularity_dir.mkdir()
-    monkeypatch.setenv("CWL_SINGULARITY_CACHE", str(singularity_dir))
+    monkeypatch.setenv("CWL_SINGULARITY_IMAGES", str(singularity_dir))
     result_code, stdout, stderr = get_main_output(
         [
             "--singularity",

tests/test_iwdr.py

@@ -275,7 +275,7 @@ def test_iwdr_permutations_singularity(
     twelfth.touch()
     outdir = str(tmp_path_factory.mktemp("outdir"))
     singularity_dir = str(tmp_path_factory.mktemp("singularity"))
-    monkeypatch.setenv("CWL_SINGULARITY_CACHE", singularity_dir)
+    monkeypatch.setenv("CWL_SINGULARITY_IMAGES", singularity_dir)
     err_code, stdout, _ = get_main_output(
         [
             "--outdir",
@@ -340,7 +340,7 @@ def test_iwdr_permutations_singularity_inplace(
     twelfth.touch()
     outdir = str(tmp_path_factory.mktemp("outdir"))
     singularity_dir = str(tmp_path_factory.mktemp("singularity"))
-    monkeypatch.setenv("CWL_SINGULARITY_CACHE", singularity_dir)
+    monkeypatch.setenv("CWL_SINGULARITY_IMAGES", singularity_dir)
     assert (
         main(
             [

tests/test_js_sandbox.py

@@ -109,7 +109,7 @@ def test_value_from_two_concatenated_expressions_singularity(
     factory.loading_context.debug = True
     factory.runtime_context.debug = True
     with monkeypatch.context() as m:
-        m.setenv("CWL_SINGULARITY_CACHE", str(singularity_cache))
+        m.setenv("CWL_SINGULARITY_IMAGES", str(singularity_cache))
         m.setenv("PATH", new_paths)
         echo = factory.make(get_data("tests/wf/vf-concat.cwl"))
         file = {"class": "File", "location": get_data("tests/wf/whale.txt")}