Merge pull request #133 from eWaterCycle/88-apptainer-invalid-version

Support 1.1.5-2.el8 apptainer version
eWaterCycle · Mar 21, 2023 · 1327b07 · 1327b07
2 parents 5a9fd3f + 44d55df
commit 1327b07
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/grpc4bmi/bmi_client_apptainer.py b/grpc4bmi/bmi_client_apptainer.py
@@ -17,7 +17,7 @@
 
 def check_apptainer_version_string(version_output: str) -> bool:
     version = version_output.split(' ').pop()
-    local_version = Version(version)
+    local_version = Version(version.replace('.el', ''))
     if local_version not in SpecifierSet(SUPPORTED_APPTAINER_VERSIONS):
         raise ApptainerVersionException(f'Unsupported version ({version_output}) of apptainer found, '
                                         f'supported versions {SUPPORTED_APPTAINER_VERSIONS}')

diff --git a/grpc4bmi/bmi_client_singularity.py b/grpc4bmi/bmi_client_singularity.py
@@ -18,7 +18,7 @@
 
 def check_singularity_version_string(version_output: str) -> bool:
     (app, _, version) = version_output.split(' ')
-    local_version = Version(version)
+    local_version = Version(version.replace('.el', ''))
     if app == 'singularity' and local_version not in SpecifierSet(SUPPORTED_SINGULARITY_VERSIONS):
         raise SingularityVersionException(f'Unsupported version ({version_output}) of singularity found, '
                                           f'supported versions {SUPPORTED_SINGULARITY_VERSIONS}')

diff --git a/test/test_apptainer.py b/test/test_apptainer.py
@@ -14,6 +14,8 @@ class Test_check_apptainer_version_string:
         ('apptainer version 1.0.3'),
         ('apptainer version 1.1.0-rc.3'),
         ('apptainer version 1.1.2'),
+        # From snellius cluster at SURF.
+        ('apptainer version 1.1.5-2.el8'),
     ])
     def test_ok(self, test_input: str):
         result = check_apptainer_version_string(test_input)

diff --git a/test/test_singularity.py b/test/test_singularity.py
@@ -235,6 +235,8 @@ class Test_check_singularity_version_string:
         ('apptainer version 1.0.3'),
         ('apptainer version 1.1.0-rc.3'),
         ('apptainer version 1.1.2'),
+        # From snellius cluster at SURF.
+        ('apptainer version 1.1.5-2.el8'),
     ])
     def test_ok(self, test_input: str):
         result = check_singularity_version_string(test_input)