Skip to content

Commit bd82c9a

Browse files
authored
Merge pull request #111 from xylar/update-to-1.9.1
Update to v1.9.1
2 parents c2b7680 + 99df025 commit bd82c9a

File tree

5 files changed

+16
-21
lines changed

5 files changed

+16
-21
lines changed

e3sm_supported_machines/bootstrap.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ def build_env(is_test, recreate, compiler, mpi, conda_mpi, version,
134134
channels = f'{channels} -c conda-forge/label/{package}_dev'
135135

136136
# edit if not using a release candidate for a given package
137-
dev_labels = ['e3sm_to_cmip', 'e3sm_diags',
138-
'mache', 'mpas_analysis', 'zppy', 'zstash']
137+
dev_labels = ['zppy', 'zstash']
139138
for package in dev_labels:
140139
channels = f'{channels} -c conda-forge/label/{package}_dev'
141140
channels = f'{channels} ' \

e3sm_supported_machines/default.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ esmpy = 8.4.2
3737

3838
esmf = [email protected]+mpi+netcdf~pnetcdf~external-parallelio
3939
hdf5 = [email protected]+cxx+fortran+hl+mpi+shared
40-
moab = [email protected].0+mpi+hdf5+netcdf+pnetcdf+metis+parmetis+tempest
41-
nco = [email protected].7+openmp
40+
moab = [email protected].1+mpi+hdf5+netcdf+pnetcdf+metis+parmetis+tempest
41+
nco = [email protected].9+openmp
4242
netcdf_c = [email protected]+mpi~parallel-netcdf
4343
netcdf_fortran = [email protected]
4444
parallel_netcdf = [email protected]

e3sm_supported_machines/shared.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
def parse_args(bootstrap):
1515
parser = argparse.ArgumentParser(
1616
description='Deploy E3SM-Unified')
17-
parser.add_argument("--version", dest="version", default="1.9.0",
17+
parser.add_argument("--version", dest="version", default="1.9.1",
1818
help="The version of E3SM-Unified to deploy")
1919
parser.add_argument("--conda", dest="conda_base",
2020
help="Path for the conda base")

recipes/e3sm-unified/build_and_upload.bash

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,14 @@ dev=False
88

99
if [ $dev == "True" ]
1010
then
11-
channels="-c conda-forge/label/e3sm_diags_dev \
12-
-c conda-forge/label/e3sm_to_cmip_dev \
13-
-c conda-forge/label/mache_dev \
14-
-c conda-forge/label/mpas_analysis_dev \
11+
channels="-c conda-forge/label/zstash_dev \
1512
-c conda-forge/label/zppy_dev \
16-
-c conda-forge \
17-
-c defaults"
13+
-c conda-forge"
1814
else
19-
channels="-c conda-forge -c defaults"
15+
channels="-c conda-forge"
2016
fi
2117

22-
#for file in configs/mpi_hpc_python3.10.yaml configs/mpi_mpich_python3.10.yaml
18+
# for file in configs/mpi_mpich_python3.10.yaml configs/mpi_hpc_python3.10.yaml
2319
for file in configs/mpi_*_python*.yaml
2420
do
2521
conda mambabuild -m $file --override-channels --use-local $channels .

recipes/e3sm-unified/meta.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% set name = "E3SM-Unified" %}
2-
{% set version = "1.9.0" %}
2+
{% set version = "1.9.1" %}
33
{% set build = 0 %}
44

55
package:
@@ -41,16 +41,16 @@ requirements:
4141
- jupyter
4242
- livvkit 3.0.1
4343
- mache 1.17.0
44-
- moab 5.5.0 {{ mpi_prefix }}_tempest_* # [mpi != 'hpc']
44+
- moab 5.5.1 {{ mpi_prefix }}_tempest_* # [mpi != 'hpc']
4545
- mpas-analysis 1.9.0
46-
- mpas_tools 0.23.0
47-
- nco 5.1.7 # [mpi != 'hpc']
46+
- mpas_tools 0.27.0
47+
- nco 5.1.9 # [mpi != 'hpc']
4848
- pcmdi_metrics 2.3.1
4949
- tempest-remap 2.2.0 # [mpi != 'hpc']
5050
- tempest-extremes 2.2.1 {{ mpi_prefix }}_* # [mpi != 'hpc']
5151
- xcdat 0.5.0
52-
- zppy 2.3.0
53-
- zstash 1.4.0 # [linux]
52+
- zppy 2.3.1
53+
- zstash 1.4.1 # [linux]
5454
### dependencies ###
5555
- {{ mpi }} # [mpi != 'nompi' and mpi != 'hpc']
5656
- blas
@@ -71,11 +71,11 @@ requirements:
7171
- genutil 8.2.1
7272
- globus-sdk
7373
- gsw
74-
- hdf5 1.14.1 {{ mpi_prefix }}_*
74+
- hdf5 1.14.2 {{ mpi_prefix }}_*
7575
- ipygany
7676
- libnetcdf 4.9.2 {{ mpi_prefix }}_*
7777
- lxml
78-
- matplotlib
78+
- matplotlib 3.7.1
7979
- metpy
8080
- mpi4py # [mpi != 'nompi' and mpi != 'hpc']
8181
- nb_conda

0 commit comments

Comments
 (0)