From 0df6e86018488d7d3c8f3b29fe04ade20871ecd2 Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Thu, 28 Sep 2023 04:52:08 -0600
Subject: [PATCH 1/2] 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 82d2e45566..cc39b6bc9e 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 d9f0041670..79542bccd3 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.26.0

From 3e37ef1622da30f1ba291cfc714fd613c9428dba Mon Sep 17 00:00:00 2001
From: Xylar Asay-Davis <xylarstorm@gmail.com>
Date: Fri, 29 Sep 2023 03:22:48 -0500
Subject: [PATCH 2/2] Switch to albany tag compass-2023-08-03

---
 conda/bootstrap.py | 1 +
 conda/default.cfg  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/conda/bootstrap.py b/conda/bootstrap.py
index b6f41f47bf..617e02a88c 100755
--- a/conda/bootstrap.py
+++ b/conda/bootstrap.py
@@ -448,6 +448,7 @@ def build_spack_env(config, update_spack, machine, compiler, mpi,  # noqa: C901
             f'@{parallelio}+pnetcdf~timing"')
 
     if albany != 'None':
+        specs.append(f'"trilinos-for-albany@{albany}"')
         specs.append(f'"albany@{albany}+mpas"')
 
     yaml_template = f'{spack_template_path}/{machine}_{compiler}_{mpi}.yaml'
diff --git a/conda/default.cfg b/conda/default.cfg
index 580505bc8e..2bfba1d0a4 100644
--- a/conda/default.cfg
+++ b/conda/default.cfg
@@ -20,7 +20,7 @@ python = 3.10
 mpi = nompi
 
 # the version of various packages to include if using spack
-albany = develop
+albany = compass-2023-08-03
 # cmake newer than 3.23.0 needed for Trilinos
 cmake = 3.23.0:
 esmf = 8.4.2