Bump python version on windows to see if vc is bumped

Disable error when version regex not set
cropsinsilico · May 23, 2024 · fa4640a · fa4640a
1 parent 9ac53e0
commit fa4640a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml
@@ -679,7 +679,7 @@ jobs:
         - macos
         - windows
         python-version:
-        - 3.8
+        - 3.9
         test-flags1:
         - long-mpi
         test-flags2:

diff --git a/utils/test-install-base.yml b/utils/test-install-base.yml
@@ -406,7 +406,7 @@ jobs:
       max-parallel: 20
       matrix:
         os-base: [ubuntu, macos, windows]
-        python-version: [3.8]
+        python-version: [3.9]  # TODO: propertly update the base version
         install-method: [conda]
         test-flags1: [long-mpi]
         test-flags2: [examples-backwards]

diff --git a/yggdrasil/drivers/CModelDriver.py b/yggdrasil/drivers/CModelDriver.py
@@ -400,6 +400,8 @@ class ARArchiver(ArchiverBase):
     output_key = ''
     output_first_library = True
     toolset = 'gnu'
+    version_regex = [
+        r'(?P<version>GNU ar version \d+\.\d+\.\d+(?:\-[\.0-9a-zA-Z]+)?)']
     compatible_toolsets = ['llvm']
     search_path_envvar = ['LIBRARY_PATH']
 

diff --git a/yggdrasil/drivers/CompiledModelDriver.py b/yggdrasil/drivers/CompiledModelDriver.py
@@ -5003,9 +5003,10 @@ def extract_tool_version(cls, x, require_match=False):
                 f"Could not locate version in string: {x} with "
                 f"regex {cls.version_regex}")
         if x and require_match:
-            raise Exception(f"{cls}: {cls.tooltype.title()} "
-                            f"{cls.toolname} does not have a "
-                            f"version regex")
+            # raise Exception(f"{cls}: {cls.tooltype.title()} "
+            #                 f"{cls.toolname} does not have a "
+            #                 f"version regex")
+            return ''
         return x
 
     @staticmethod

diff --git a/yggdrasil/drivers/MakeModelDriver.py b/yggdrasil/drivers/MakeModelDriver.py
@@ -19,7 +19,7 @@ class MakeBuilder(BuilderBase):
         [('buildfile', {'key': '-f', 'position': 0})])
     output_key = None
     build_params = ['target']
-    version_regex = r'(?P<version>GNU Make \d+\.\d+(?:\.\d+)?)'
+    version_regex = [r'(?P<version>GNU Make \d+\.\d+(?:\.\d+)?)']
 
     @classmethod
     def get_flags(cls, target=None, **kwargs):