Un-pin py-numpy and py-pandas, update module names of convenience mod…

…ules
climbfuji · Jul 19, 2023 · 51ea335 · 51ea335
1 parent d038947
commit 51ea335
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/macos-ci-aarch64.yaml b/.github/workflows/macos-ci-aarch64.yaml
@@ -142,13 +142,13 @@ jobs:
 
           module use ${ENVDIR}/install/modulefiles/Core
           module load stack-apple-clang/14.0.0
-          module load stack-openmpi
+          module load stack-openmpi/4.1.5
           module load stack-python/3.10.8
           module available
 
-          module load jedi-ufs-env/unified-dev
-          module load ewok-env/unified-dev
-          module load soca-env/unified-dev
+          module load jedi-ufs-env/1.0.0
+          module load ewok-env/1.0.0
+          module load soca-env/1.0.0
           module list
 
       # Skip this for now, copied from other yaml

diff --git a/.github/workflows/macos-ci-x86_64.yaml b/.github/workflows/macos-ci-x86_64.yaml
@@ -133,13 +133,13 @@ jobs:
 
           module use ${ENVDIR}/install/modulefiles/Core
           module load stack-apple-clang/14.0.0
-          module load stack-openmpi
+          module load stack-openmpi/4.1.5
           module load stack-python/3.10.8
           module available
 
-          module load jedi-ufs-env/unified-dev
-          module load ewok-env/unified-dev
-          module load soca-env/unified-dev
+          module load jedi-ufs-env/1.0.0
+          module load ewok-env/1.0.0
+          module load soca-env/1.0.0
           module list
 
       # Skip this for now, copied from other yaml

diff --git a/.github/workflows/ubuntu-ci-x86_64.yaml b/.github/workflows/ubuntu-ci-x86_64.yaml
@@ -175,9 +175,9 @@ jobs:
           module load stack-python/3.10.8
           module available
 
-          module load jedi-ufs-env/unified-dev
-          module load ewok-env/unified-dev
-          module load soca-env/unified-dev
+          module load jedi-ufs-env/1.0.0
+          module load ewok-env/1.0.0
+          module load soca-env/1.0.0
           module list
 
       # Skip this for now, copied from other yaml

diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
@@ -203,12 +203,14 @@
       version: ['1.5.3']
       variants: ~mpi
     py-numpy:
-      version: ['1.22.3']
+      # DH* 20230719 try without version
+      #version: ['1.22.3']
       variants: +blas +lapack
     py-openpyxl:
       version: ['3.0.3']
-    py-pandas:
-      version: ['1.4.0']
+    # DH* 20230719 try without version
+    #py-pandas:
+    #  version: ['1.4.0']
     # To avoid pip._vendor.pep517.wrappers.BackendInvalid errors with newer
     # versions of py-poetry-core when using external/homebrew Python as
     # we do at the moment in spack-stack.

diff --git a/spack b/spack