Upgrade bufr to 12.1.0, build met/metplus 9.1.3/3.1.1 in the unified environment

.github/workflows/macos-ci-aarch64.yaml

@@ -168,7 +168,7 @@ jobs:
           module use ${ENVDIR}/install/modulefiles/Core
           module load stack-apple-clang/14.0.3
           module load stack-openmpi/5.0.3
-          module load stack-python/3.10.13
+          module load stack-python/3.11.7
           module available
 
           module load jedi-ufs-env

.github/workflows/ubuntu-ci-x86_64-gnu.yaml

@@ -199,7 +199,7 @@ jobs:
           module use ${ENVDIR}/install/modulefiles/Core
           module load stack-gcc/11.4.0
           module load stack-openmpi/5.0.3
-          module load stack-python/3.10.13
+          module load stack-python/3.11.7
           module available
 
           module load jedi-ufs-env

.github/workflows/ubuntu-ci-x86_64-intel.yaml

@@ -232,7 +232,7 @@ jobs:
           module use ${ENVDIR}/install/modulefiles/Core
           module load stack-intel/2021.10.0
           module load stack-intel-oneapi-mpi/2021.10.0
-          module load stack-python/3.10.13
+          module load stack-python/3.11.7
           module available
 
           module load jedi-ufs-env

.github/workflows/ubuntu-ci-x86_64-oneapi.yaml

@@ -239,7 +239,7 @@ jobs:
           module use ${ENVDIR}/install/modulefiles/Core
           module load stack-oneapi/2024.2.0
           module load stack-intel-oneapi-mpi/2021.13
-          module load stack-python/3.10.13
+          module load stack-python/3.11.7
           module available
 
           module load jedi-ufs-env

configs/common/packages.yaml

@@ -19,7 +19,9 @@ packages:
   boost:
     require: '@1.84 ~atomic +chrono +date_time +exception +filesystem ~graph ~iostreams ~locale ~log ~math ~mpi ~numpy +pic +program_options +python ~random +regex +serialization ~signals +system +test +thread +timer ~wave cxxstd=17 visibility=hidden'
   bufr:
-    require: '@12.0.1 +python'
+    require:
+      - '+python'
+      - '@=12.1.0'
   cairo:
     require: '+pic'
   cdo:
@@ -132,9 +134,12 @@ packages:
     variants: '+pflogger'
   # If making changes here, also check the Discover site configs and the CI workflows
   met:
-    require: '@11.1.1 +python +grib2'
+    require:
+      - any_of: ['@=11.1.1', '@=9.1.3']
+      - '+python +grib2'
   metplus:
-    require: '@5.1.0'
+    require:
+      - any_of: ['@=5.1.0', '@=3.1.1']
   metis:
     require: '+int64 +real64'
   mpich:
@@ -182,7 +187,7 @@ packages:
   proj:
     require: '~tiff'
   python:
-    require: '@3.10.13'
+    require: '@3.11.7'
   py-attrs:
     # https://github.com/JCSDA/spack-stack/issues/740
     require: '@21.4.0'

configs/containers/specs/jedi-ci.yaml

@@ -1,6 +1,6 @@
   ### spack-stack-1.6.0 / skylab-7.x.y containers for fv3-jedi and mpas-jedi (but not for ufs-jedi)
   specs: [[email protected], [email protected], [email protected], [email protected],
-    [email protected], [email protected], [email protected], bufr@12.0.1, [email protected], [email protected], ecflow@5,
+    [email protected], [email protected], [email protected], bufr@12.1.0, [email protected], [email protected], ecflow@5,
     [email protected], [email protected] +fckit +trans +tesselation +fftw, [email protected], [email protected] +fftw,
     [email protected], [email protected], [email protected], [email protected], [email protected],
     [email protected], [email protected], [email protected], [email protected], [email protected], [email protected],

configs/templates/gsi-addon-dev/spack.yaml

@@ -12,20 +12,14 @@ spack:
   - site
   - common
   definitions:
-  # Note: Set 'compilers' manually; must match upstream list
-  - compilers: []
+  - compilers: ['%aocc', '%apple-clang', '%gcc', '%intel', '%oneapi']
   - packages:
     - global-workflow-env ^[email protected] ^[email protected] ^[email protected]
     - ufs-weather-model-env
+    - emc-verif-global-env
     - gsi-env
 
   specs:
   - matrix:
     - [$packages]
     - [$compilers]
-
-  packages:
-    python::
-      require: ['@3.11.6']
-    py-numpy::
-      require: ['@1.23.4']

configs/templates/ufs-srw-dev/spack.yaml

@@ -35,7 +35,7 @@ spack:
   - [email protected]
   - [email protected]
   - [email protected]
-  - bufr@12.0.0
+  - bufr@12.1.0
   - [email protected]
   - [email protected]
   - [email protected]
@@ -54,5 +54,5 @@ spack:
   - [email protected]
   - [email protected]
   - [email protected]
-  - [email protected].0
+  - [email protected].1
   - [email protected]

configs/templates/unified-dev/spack.yaml

@@ -23,7 +23,7 @@ spack:
     - jedi-um-env
     - neptune-env ~python   ^esmf@=8.7.0b11 snapshot=b11
     - soca-env
-    - ufs-srw-app-env       ^esmf@=8.6.1
+    - ufs-srw-app-env       ^esmf@=8.6.1 ^[email protected] ^[email protected]
     - ufs-weather-model-env ^esmf@=8.6.1
 
     # Various crtm tags (list all to avoid duplicate packages)

spack-ext/repos/spack-stack/packages/emc-verif-global-env/package.py

@@ -22,6 +22,11 @@ class EmcVerifGlobalEnv(BundlePackage):
     depends_on("nco")
     depends_on("prod-util")
     depends_on("grib-util")
+    depends_on("py-cartopy")
+    depends_on("py-numpy")
+    depends_on("py-netcdf4")
+    depends_on("py-matplotlib")
+    depends_on("py-pandas")
     # Test grads
     # depends_on('grads')
     # Currently, wgrib2 doesn't build with oneapi,
@@ -31,7 +36,9 @@ class EmcVerifGlobalEnv(BundlePackage):
     depends_on("wgrib2", when="%intel")
     depends_on("python")
     depends_on("prod-util")
-    depends_on("met")
-    depends_on("metplus")
+    depends_on("[email protected]", when="%gcc")
+    depends_on("[email protected]", when="%intel")
+    depends_on("[email protected]", when="%gcc")
+    depends_on("[email protected]", when="%intel")
 
     # There is no need for install() since there is no code.

spack-ext/repos/spack-stack/packages/global-workflow-env/package.py

@@ -43,8 +43,10 @@ class GlobalWorkflowEnv(BundlePackage):
     depends_on("wgrib2", when="%apple-clang")
     depends_on("wgrib2", when="%gcc")
     depends_on("wgrib2", when="%intel")
-    depends_on("met")
-    depends_on("metplus")
+    depends_on("[email protected]", when="%gcc")
+    depends_on("[email protected]", when="%intel")
+    depends_on("[email protected]", when="%gcc")
+    depends_on("[email protected]", when="%intel")
     depends_on("gsi-ncdiag")
     depends_on("[email protected]")
     depends_on("py-wxflow", when="+python")