Merge pull request #704 from xylar/update-to-1.2.0-alpha.7

Update to 1.2.0-alpha.7
MPAS-Dev · Dec 3, 2023 · baafeba · baafeba
2 parents cebf950 + 3e37ef1
commit baafeba
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git 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/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/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
@@ -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/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

diff --git 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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = '1.2.0-alpha.6'
		__version__ = '1.2.0-alpha.7'