diff --git a/.github/workflows/macos-ci-aarch64.yaml b/.github/workflows/macos-ci-aarch64.yaml index f5f00f4ad..ab2e77078 100644 --- 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 index d21cb6b0e..5f9289227 100644 --- 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 index 0600f58ea..5c3c7cb25 100644 --- 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 index d4239cefb..9ab97389e 100644 --- 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 index f8d3c5526..d6f12ecd7 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit f8d3c5526b3effadc1490fd30f2972a1084d3646 +Subproject commit d6f12ecd7725cf2195556a870c1685705c1085e4