Merge pull request #116 from xylar/update-to-1.10.0

Update to v1.10.0

Author: xylar

e3sm_supported_machines/bootstrap.py

@@ -139,7 +139,7 @@ def build_env(is_test, recreate, compiler, mpi, conda_mpi, version,
                 channels = f'{channels} -c conda-forge/label/{package}_dev'
 
         # edit if not using a release candidate for a given package
-        dev_labels = ['e3sm_diags', 'e3sm_to_cmip', 'mache', 'zppy']
+        dev_labels = ['e3sm_diags', 'mpas_analysis', 'zppy']
         for package in dev_labels:
             channels = f'{channels} -c conda-forge/label/{package}_dev'
         channels = f'{channels} ' \

e3sm_supported_machines/default.cfg

@@ -22,7 +22,7 @@ ilamb = 2.7
 
 # the version of mache to use during deployment (should match the version used
 # in the package itself)
-mache = 1.21.0
+mache = 1.22.0
 
 # the version of mpi4py to build if using system compilers
 mpi4py = 3.1.5
@@ -38,7 +38,7 @@ esmpy = 8.6.0
 esmf = [email protected]+mpi+netcdf~pnetcdf~external-parallelio
 hdf5 = [email protected]+cxx+fortran+hl+mpi+shared
 moab = [email protected]+mpi+hdf5+netcdf+pnetcdf+metis+parmetis+tempest
-nco = [email protected].2+openmp
+nco = [email protected].4+openmp
 netcdf_c = [email protected]+mpi~parallel-netcdf
 netcdf_fortran = [email protected]
 parallel_netcdf = [email protected]

e3sm_supported_machines/shared.py

@@ -14,7 +14,7 @@
 def parse_args(bootstrap):
     parser = argparse.ArgumentParser(
         description='Deploy E3SM-Unified')
-    parser.add_argument("--version", dest="version", default="1.9.3",
+    parser.add_argument("--version", dest="version", default="1.10.0",
                         help="The version of E3SM-Unified to deploy")
     parser.add_argument("--conda", dest="conda_base",
                         help="Path for the  conda base")

recipes/e3sm-unified/build_and_upload.bash

@@ -13,10 +13,10 @@ if [ $dev == "True" ]
 then
 
   channels="-c conda-forge/label/e3sm_diags_dev \
-            -c conda-forge/label/e3sm_to_cmip_dev \
-            -c conda-forge/label/mache_dev \
+            -c conda-forge/label/mpas_analysis_dev \
             -c conda-forge/label/zppy_dev \
-            -c conda-forge"
+            -c conda-forge \
+            -c e3sm/label/e3sm_dev"
 
   for file in configs/mpi_mpich_python3.10.yaml configs/mpi_hpc_python3.10.yaml
   do
@@ -30,7 +30,7 @@ then
 
 else
 
-  channels="-c conda-forge"
+  channels="-c conda-forge -c e3sm"
   for file in configs/mpi_*_python*.yaml
   do
     conda build -m $file --override-channels $channels .

recipes/e3sm-unified/meta.yaml

@@ -1,5 +1,5 @@
 {% set name = "E3SM-Unified" %}
-{% set version = "1.9.3" %}
+{% set version = "1.10.0" %}
 {% set build = 0 %}
 
 package:
@@ -30,26 +30,29 @@ requirements:
   run:
     ### main packages ###
     - python
-    - chemdyg 0.1.5
-    - e3sm_diags 2.11.0
+    - r
+    - chemdyg 1.0.1
+    - e3sm_diags 2.12.0
     - e3sm_to_cmip 1.11.2
+    - e3sm-tools 3.0.0  # [linux]
     - geometric_features 1.3.0
     # fixes an issues with cryptography <37 constraint
     - globus-cli >=3.15.0
     - ilamb 2.7  # [mpi != 'nompi' and mpi != 'hpc']
     - ipython
     - jupyter
     - livvkit 3.0.1
-    - mache 1.21.0
+    - mache 1.22.0
     - moab 5.5.1 {{ mpi_prefix }}_tempest_*  # [mpi != 'hpc']
-    - mpas-analysis 1.10.0
-    - mpas_tools 0.32.0
-    - nco 5.2.2  # [mpi != 'hpc']
+    - mpas-analysis 1.11.0
+    - mpas_tools 0.33.0
+    - nco 5.2.4  # [mpi != 'hpc']
     - pcmdi_metrics 2.3.1
     - tempest-remap 2.2.0  # [mpi != 'hpc']
     - tempest-extremes 2.2.1 {{ mpi_prefix }}_*  # [mpi != 'hpc']
-    - xcdat 0.6.1
-    - zppy 2.4.0
+    - uxarray >=2024.04.0
+    - xcdat 0.7.0
+    - zppy 2.5.0
     - zstash 1.4.2  # [linux]
 
     ### mkdocs
@@ -58,6 +61,8 @@ requirements:
     - mkdocs-monorepo-plugin
     - mdutils
     - mkdocs-bibtex
+    - mkdocs-redirects
+    - markdownlint-cli2
 
     ### dependencies ###
     - {{ mpi }}  # [mpi != 'nompi' and mpi != 'hpc']
@@ -90,6 +95,7 @@ requirements:
     - nb_conda_kernels
     - ncview 2.1.8
     - ncvis-climate 2023.09.12
+    - nc-time-axis
     - netcdf4 1.6.4 nompi_*
     - notebook <7.0.0
     - numpy >1.13
@@ -104,11 +110,15 @@ requirements:
     - pyremap
     - pytest
     - pywavelets
+    - r-tidyverse
+    - r-dplyr
+    - r-ggplot2
     - scikit-image
     - scipy >=0.9.0
     - shapely
     - sympy >=0.7.6
     - tabulate
+    - windspharm  # [py<=310]
     - xarray 2023.5.0
     - xesmf