Merge pull request #879 from xylar/update-to-1.7.0-alpha.1

Update to 1.7.0-alpha.1
MPAS-Dev · Jan 10, 2025 · 7948899 · 7948899
2 parents 1c38add + ae5efc3
commit 7948899
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml
@@ -88,6 +88,7 @@ jobs:
           miniforge-version: latest
           channels: conda-forge,e3sm/label/compass
           channel-priority: strict
+          use-mamba: false
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
 

diff --git a/.github/workflows/docs_workflow.yml b/.github/workflows/docs_workflow.yml
@@ -40,6 +40,7 @@ jobs:
           miniforge-version: latest
           channels: conda-forge,e3sm/label/compass
           channel-priority: strict
+          use-mamba: false
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
 

diff --git a/compass/version.py b/compass/version.py
@@ -1 +1 @@
-__version__ = '1.6.0-alpha.2'
+__version__ = '1.7.0-alpha.1'
diff --git a/conda/compass_env/spec-file.template b/conda/compass_env/spec-file.template
@@ -6,17 +6,17 @@ python>=3.9
 cartopy
 cartopy_offlinedata
 cmocean
-esmf=8.6.1={{ mpi_prefix }}_*
+esmf=8.7.0={{ mpi_prefix }}_*
 ffmpeg
-geometric_features=1.6.0
+geometric_features=1.6.1
 git
 gsw
 h5py
 ipython
 jupyter
 lxml
 {% if include_mache %}
-mache=1.26.0
+mache=1.27.0
 {% endif %}
 matplotlib-base >=3.9.1
 metis

diff --git a/conda/configure_compass_env.py b/conda/configure_compass_env.py
@@ -102,7 +102,7 @@ def main():
     if local_mache:
         mache = ''
     else:
-        mache = '"mache=1.26.0"'
+        mache = '"mache=1.27.0"'
 
     setup_install_env(env_name, activate_base, args.use_local, logger,
                       args.recreate, conda_base, mache)

diff --git a/conda/default.cfg b/conda/default.cfg
@@ -26,11 +26,11 @@ albany_variants = +mpas~py+unit_tests
 trilinos_variants =
 # cmake newer than 3.23.0 needed for Trilinos
 cmake = 3.23.0:
-esmf = 8.6.1
+esmf = 8.7.0
 hdf5 = 1.14.3
 lapack = 3.9.1
 metis = 5.1.0
-moab = 5.5.1
+moab = master
 netcdf_c = 4.9.2
 netcdf_fortran = 4.6.1
 petsc = 3.19.1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = '1.6.0-alpha.2'
		__version__ = '1.7.0-alpha.1'