diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml index 27354005a9..391f85d94e 100644 --- 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 index bc7b376b8e..383c8215a8 100644 --- 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 index b95a324169..3fd0d93cfa 100644 --- 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 index 7104b9cceb..2cc1536b9a 100644 --- a/conda/compass_env/spec-file.template +++ b/conda/compass_env/spec-file.template @@ -6,9 +6,9 @@ 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 @@ -16,7 +16,7 @@ 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 index 1bde75f942..88d86e4815 100755 --- 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 index b640723203..e4d78e02c9 100644 --- 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