Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 1.2.0-alpha.7 #704

Merged
merged 2 commits into from
Dec 3, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compass/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.2.0-alpha.6'
__version__ = '1.2.0-alpha.7'
1 change: 1 addition & 0 deletions conda/bootstrap.py
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 1 addition & 1 deletion conda/compass_env/spec-file.template
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion conda/configure_compass_env.py
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion conda/default.cfg
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions conda/recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -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