Merge pull request #89 from eWaterCycle/semver-valueerror-88

Replace bad chars in singularity version
eWaterCycle · Jan 26, 2021 · 27b8e22 · 27b8e22
2 parents 54beca8 + bfbbc32
commit 27b8e22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
         pip install -r requirements.txt
         python setup.py install
     - name: Setup Singularity
-      uses: eWaterCycle/setup-singularity@v4
+      uses: eWaterCycle/setup-singularity@v5
       with:
         singularity-version: 3.6.4
     - name: Pull Docker image
@@ -52,7 +52,7 @@ jobs:
         with:
           submodules: true
       - name: Install grpc
-        uses: ewatercycle/setup-grpc@master
+        uses: ewatercycle/setup-grpc@v3
         with:
           grpc-version: 1.27.2
       - name: Copy grpc to system default

diff --git a/grpc4bmi/bmi_client_singularity.py b/grpc4bmi/bmi_client_singularity.py
@@ -18,7 +18,7 @@ def check_singularity_version():
     (stdout, _stderr) = p.communicate()
     if p.returncode != 0:
         raise Exception('Unable to determine singularity version')
-    if not semver.match(stdout.decode('utf-8'), REQUIRED_SINGULARITY_VERSION):
+    if not semver.match(stdout.decode('utf-8').replace('_', '-'), REQUIRED_SINGULARITY_VERSION):
         raise Exception(f'Wrong version of singularity found, require version {REQUIRED_SINGULARITY_VERSION}')
     return True