November 2023 main Spack merge + updates

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

@@ -105,7 +105,7 @@ jobs:
           # base-env
           echo "base-env ..."
           spack install --fail-fast --source --no-check-signature base-env 2>&1 | tee log.install.apple-clang-14.0.3.base-env
-          spack buildcache create -a -u /Users/ec2-user/spack-stack/build-cache/
+          spack buildcache create -a -u /Users/ec2-user/spack-stack/build-cache/ base-env
 
           # the rest
           echo "${{ inputs.template || 'unified-dev' }} ..."

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

@@ -98,7 +98,7 @@ jobs:
           # base-env
           echo "base-env ..."
           spack install --fail-fast --source --no-check-signature base-env 2>&1 | tee log.install.apple-clang-14.0.0.base-env
-          spack buildcache create -a -u /Users/ec2-user/spack-stack/build-cache/
+          spack buildcache create -a -u /Users/ec2-user/spack-stack/build-cache/ base-env
 
           # the rest
           echo "${{ inputs.template || 'unified-dev' }} ..."

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

@@ -136,7 +136,7 @@ jobs:
           # base-env
           echo "base-env ..."
           spack install --fail-fast --source --no-check-signature base-env 2>&1 | tee log.install.intel-2022.1.0.base-env
-          spack buildcache create -a -u /home/ubuntu/spack-stack/build-cache/
+          spack buildcache create -a -u /home/ubuntu/spack-stack/build-cache/ base-env
 
           # the rest
           echo "${{ inputs.template || 'unified-dev' }} ..."

.gitmodules

@@ -2,8 +2,8 @@
   path = spack
   #url = https://github.com/spack/spack
   #branch = develop
-  url = https://github.com/jcsda/spack
-  branch = jcsda_emc_spack_stack
+  url = https://github.com/AlexanderRichert-NOAA/spack
+  branch = nov2023_spackmerge
 [submodule "doc/CMakeModules"]
   path = doc/CMakeModules
   url = https://github.com/noaa-emc/cmakemodules

configs/common/packages.yaml

@@ -82,7 +82,7 @@
       #version: ['2023.01']
       #variants: precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release
       version: ['2023.02.01']
-      variants: precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release +use_fmsio
+      variants: precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release +deprecated_io
     fontconfig:
       variants: +pic
     freetype:
@@ -93,6 +93,8 @@
       version: ['1.6.4']
     g2tmpl:
       version: ['1.10.2']
+    gettext:
+      version: ['0.21.1']
     gfsio:
       version: ['1.4.1']
     gftl-shared:
@@ -119,6 +121,7 @@
       variants: +hl +fortran +mpi ~threadsafe +szip
     ip:
       version: ['4.3.0']
+      variants: precision=4,d,8
     ip2:
       version: ['1.1.2']
     jasper:
@@ -152,6 +155,8 @@
       version: ['5.1.0']
     mpich:
       variants: ~hwloc +two_level_namespace
+    mysql:
+      variants: +download_boost
     nco:
       version: ['5.0.6']
       variants: ~doc
@@ -189,7 +194,6 @@
       variants: +internal-hwloc +two_level_namespace
     # Pin openssl to avoid duplicate packages being built
     openssl:
-      version: ['1.1.1u']
       variants: +shared
     p4est:
       version: ['2.8']
@@ -204,7 +208,7 @@
     pkgconf:
       buildable: False
     prod-util:
-      version: ['1.2.2']
+      version: ['2.1.0']
     proj:
       version: ['8.1.0']
       variants: ~tiff
@@ -219,9 +223,8 @@
       variants: +plotting
     py-click:
       version: ['8.0.3']
-    # Pin py-cryptography to a version earlier than 3.4 to avoid the rust dependency
     py-cryptography:
-      version: ['3.3.2']
+      variants: +rust_bootstrap
     py-eccodes:
       version: ['1.4.2']
     py-h5py:
@@ -237,8 +240,7 @@
       version: ['1.5.8']
       variants: ~mpi
     py-numpy:
-      version: ['1.22.3']
-      variants: +blas +lapack
+      require: ['@1.22.3']
     py-pandas:
       variants: +excel
     # To avoid pip._vendor.pep517.wrappers.BackendInvalid errors with newer
@@ -266,10 +268,9 @@
       version: ['1.9.3']
     # Pin the py-setuptools version to avoid duplicate Python packages
     py-setuptools:
-      version: ['59.4.0']
-    # Pin the py-setuptools-scm version to avoid duplicate Python packages
-    py-setuptools-scm:
-      version: ['7.0.5']
+      require: ['@63.4.3']
+    py-setuptools-rust:
+      variants: +rust_bootstrap
     py-shapely:
       version: ['1.8.0']
     qt:
@@ -285,12 +286,14 @@
       version: ['2.3.2']
     sp:
       version: ['2.3.3']
+      variants: precision=4,d,8
     udunits:
       version: ['2.2.28']
     upp:
       version: ['10.0.10']
     w3emc:
       version: ['2.10.0']
+      variants: precision=4,d,8
     w3nco:
       version: ['2.4.1']
     wget: