Merge pull request #718 from xylar/update-to-mpas-tools-0.26.0

Update to mpas_tools 0.26.0
MPAS-Dev · Oct 16, 2023 · bf035ca · bf035ca
2 parents b13977d + 7fac689
commit bf035ca
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/compass/config.py b/compass/config.py
@@ -1,4 +1,5 @@
 import os
+
 from mpas_tools.config import MpasConfigParser
 
 
@@ -14,8 +15,17 @@ class CompassConfigParser(MpasConfigParser):
     certain paths are absolute, rather than relative.
     """
 
-    def combine(self):
-        super().combine()
+    def combine(self, raw=False):
+        """
+        Combine the config files into one
+
+        Parameters
+        ----------
+        raw : bool, optional
+            Whether to combine config "raw" config options, rather than using
+            extended interpolation
+        """
+        super().combine(raw=raw)
         self._ensure_absolute_paths()
 
     def _ensure_absolute_paths(self):

diff --git a/conda/compass_env/spec-file.template b/conda/compass_env/spec-file.template
@@ -22,7 +22,7 @@ mache=1.16.0
 {% endif %}
 matplotlib-base
 metis
-mpas_tools=0.23.0
+mpas_tools=0.26.0
 nco
 netcdf4=*=nompi_*
 numpy

diff --git a/conda/recipe/meta.yaml b/conda/recipe/meta.yaml
@@ -57,7 +57,7 @@ requirements:
     - mache 1.16.0
     - matplotlib-base
     - metis
-    - mpas_tools 0.23.0
+    - mpas_tools 0.26.0
     - nco
     - netcdf4 * nompi_*
     - numpy