From fa4640a36ca6d9402b2e7e33fde8bab2ed01c887 Mon Sep 17 00:00:00 2001
From: Meagan Lang <langmm.astro@gmail.com>
Date: Thu, 23 May 2024 17:10:10 -0400
Subject: [PATCH] Bump python version on windows to see if vc is bumped Disable
 error when version regex not set

---
 .github/workflows/test-install.yml       | 2 +-
 utils/test-install-base.yml              | 2 +-
 yggdrasil/drivers/CModelDriver.py        | 2 ++
 yggdrasil/drivers/CompiledModelDriver.py | 7 ++++---
 yggdrasil/drivers/MakeModelDriver.py     | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml
index 0ba343191..4d8ee971c 100644
--- 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
index d9b15d2a8..1cc4bcb38 100644
--- 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
index c41a949f7..9bf3335f7 100755
--- 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
index 0d7104980..e56e1bd87 100644
--- 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
index 8796ed5e7..277fbf996 100644
--- 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):