Merge branch 'develop' into misc_aug2023

AlexanderRichert-NOAA · Aug 29, 2023 · 3774b8e · 3774b8e
2 parents 97068c1 + 0dfd385
commit 3774b8e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
@@ -38,6 +38,7 @@
       version: ['3.7.2']
     eccodes:
       version: ['2.27.0']
+      variants: +png
     ecflow:
       version: ['5.8.4']
       variants: +ui
@@ -171,7 +172,9 @@
       variants: +noavx512
     openmpi:
       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']
@@ -197,6 +200,9 @@
       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']
     py-eccodes:
       version: ['1.4.2']
     py-h5py:

diff --git a/configs/templates/skylab-dev/spack.yaml b/configs/templates/skylab-dev/spack.yaml
@@ -23,7 +23,6 @@ spack:
 
       # Various crtm tags (list all to avoid duplicate packages)
       - [email protected]
-      - [email protected]
       - [email protected]
 
   specs:

diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml
@@ -32,7 +32,6 @@ spack:
 
       # Various crtm tags (list all to avoid duplicate packages)
       - [email protected]
-      - [email protected]
       - [email protected]
 
       # MADIS for WCOSS2 decoders.

diff --git a/spack b/spack