fix: allow apptainer as a successor to singularity. (#1706)

Closes #1570.
snakemake · Jun 15, 2022 · bcbdb0b · bcbdb0b
1 parent 1d4909e
commit bcbdb0b
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/snakemake/deployment/singularity.py b/snakemake/deployment/singularity.py
@@ -173,9 +173,14 @@ def check(self):
                 raise WorkflowError(
                     "Failed to get singularity version:\n{}".format(e.stderr.decode())
                 )
-            v = v.rsplit(" ", 1)[-1]
-            if v.startswith("v"):
-                v = v[1:]
-            if not LooseVersion(v) >= LooseVersion("2.4.1"):
-                raise WorkflowError("Minimum singularity version is 2.4.1.")
+            if v.startswith("apptainer"):
+                v = v.rsplit(" ", 1)[-1]
+                if not LooseVersion(v) >= LooseVersion("1.0.0"):
+                    raise WorkflowError("Minimum apptainer version is 1.0.0.")
+            else:
+                v = v.rsplit(" ", 1)[-1]
+                if v.startswith("v"):
+                    v = v[1:]
+                if not LooseVersion(v) >= LooseVersion("2.4.1"):
+                    raise WorkflowError("Minimum singularity version is 2.4.1.")
             self._version = v