Add py-globus-cli to ewok-env, fix spack stack setup-meta-modules f…

…or no MPI in environment (JCSDA#744) * Update submodule pointer for spack * Pin py-cryptography to an earlier version to avoid dependency on rust * Pin openssl to version 1.1.1u to avoid duplicate packages being built * Remove unused [email protected] from skylab-dev and unified-dev templates
AlexanderRichert-NOAA · Aug 29, 2023 · 0dfd385 · 0dfd385
1 parent c1c26fb
commit 0dfd385
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
@@ -172,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']
@@ -198,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
+11 −3		lib/jcsda-emc/spack-stack/stack/meta_modules.py
+35 −0		var/spack/repos/builtin/packages/py-globus-cli/package.py
+3 −1		var/spack/repos/builtin/packages/py-globus-sdk/package.py
+2 −1		var/spack/repos/jcsda-emc-bundles/packages/ewok-env/package.py