From 15bc19d07d05897e4753fd701153d8ca8423ac7a Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 1 Mar 2023 22:10:03 +0100 Subject: [PATCH] Update to mache 1.12.0 --- .pre-commit-config.yaml | 1 + conda/compass_env/spec-file.template | 2 +- conda/configure_compass_env.py | 2 +- conda/recipe/meta.yaml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 49510c8663..e8f97fe226 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,6 +9,7 @@ repos: - id: trailing-whitespace - id: end-of-file-fixer - id: check-yaml + exclude: conda # Can run individually with `pre-commit run isort --all-files` - repo: https://github.com/PyCQA/isort diff --git a/conda/compass_env/spec-file.template b/conda/compass_env/spec-file.template index 81c40742d3..4a71032125 100644 --- a/conda/compass_env/spec-file.template +++ b/conda/compass_env/spec-file.template @@ -16,7 +16,7 @@ jigsawpy=0.3.3 jupyter lxml {% if include_mache %} -mache=1.10.0 +mache=1.12.0 {% endif %} matplotlib-base metis diff --git a/conda/configure_compass_env.py b/conda/configure_compass_env.py index a9d86536dc..ed19595e72 100755 --- a/conda/configure_compass_env.py +++ b/conda/configure_compass_env.py @@ -98,7 +98,7 @@ def main(): if local_mache: mache = '' else: - mache = '"mache=1.10.0"' + mache = '"mache=1.12.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 2d77664ab3..7156f6598b 100644 --- a/conda/recipe/meta.yaml +++ b/conda/recipe/meta.yaml @@ -52,7 +52,7 @@ requirements: - jigsawpy 0.3.3 - jupyter - lxml - - mache 1.10.0 + - mache 1.12.0 - matplotlib-base - metis - mpas_tools 0.17.0