From 2040e614ea51e0b622c1744181593fea6f4c2ea7 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Thu, 28 Sep 2023 04:52:08 -0600 Subject: [PATCH] Update to 1.2.0-alpha.7 This merge also updates mache to 1.17.0, which updates support for Chicoma. --- compass/version.py | 2 +- conda/compass_env/spec-file.template | 2 +- conda/configure_compass_env.py | 2 +- conda/recipe/meta.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compass/version.py b/compass/version.py index 447b7d027d..ea741b78e4 100644 --- a/compass/version.py +++ b/compass/version.py @@ -1 +1 @@ -__version__ = '1.2.0-alpha.6' +__version__ = '1.2.0-alpha.7' diff --git a/conda/compass_env/spec-file.template b/conda/compass_env/spec-file.template index 65a5a56c8c..948b5ce382 100644 --- a/conda/compass_env/spec-file.template +++ b/conda/compass_env/spec-file.template @@ -18,7 +18,7 @@ jigsawpy=0.3.3 jupyter lxml {% if include_mache %} -mache=1.16.0 +mache=1.17.0 {% endif %} matplotlib-base metis diff --git a/conda/configure_compass_env.py b/conda/configure_compass_env.py index 28bf66c368..00d3fb8487 100755 --- a/conda/configure_compass_env.py +++ b/conda/configure_compass_env.py @@ -101,7 +101,7 @@ def main(): if local_mache: mache = '' else: - mache = '"mache=1.16.0"' + mache = '"mache=1.17.0"' setup_install_env(env_name, activate_base, args.use_local, logger, args.recreate, conda_base, mache) diff --git a/conda/recipe/meta.yaml b/conda/recipe/meta.yaml index 2cb1087b39..3be4652e41 100644 --- a/conda/recipe/meta.yaml +++ b/conda/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "compass" %} -{% set version = "1.2.0alpha.6" %} +{% set version = "1.2.0alpha.7" %} {% set build = 0 %} {% if mpi == "nompi" %} @@ -54,7 +54,7 @@ requirements: - jigsawpy 0.3.3 - jupyter - lxml - - mache 1.16.0 + - mache 1.17.0 - matplotlib-base - metis - mpas_tools 0.23.0