diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 4e78711ea..1deb17e35 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -214,6 +214,9 @@ packages: ## To avoid duplicate packages #py-jinja2: # require: '@3.1.2' + # https://github.com/JCSDA/spack-stack/issues/1276 + py-matplotlib: + require: '@3.7.4' py-meson-python: require: '@0.15.0' # Comment out for now until build problems are solved @@ -226,9 +229,10 @@ packages: require: '@1.5.8 ~mpi' # py-numpy@1.26 causes many build problems with older Python packages # also check Nautilus site config when making changes here + # https://github.com/JCSDA/spack-stack/issues/1276 py-numpy: require: - - '@:1.25' + - '@:1.23.5' py-pandas: require: '+excel' py-pybind11: diff --git a/configs/sites/tier1/acorn/packages_intel.yaml b/configs/sites/tier1/acorn/packages_intel.yaml index 34065c870..5868e5481 100644 --- a/configs/sites/tier1/acorn/packages_intel.yaml +++ b/configs/sites/tier1/acorn/packages_intel.yaml @@ -31,7 +31,7 @@ - '@1.2.1 ~mkl' py-numpy: require:: - - '@:1.25 ^openblas' + - '@:1.23 ^openblas' # *DH eckit: require: diff --git a/configs/sites/tier1/aws-pcluster/packages_intel.yaml b/configs/sites/tier1/aws-pcluster/packages_intel.yaml index 1363ff58f..7fb3d8477 100644 --- a/configs/sites/tier1/aws-pcluster/packages_intel.yaml +++ b/configs/sites/tier1/aws-pcluster/packages_intel.yaml @@ -31,5 +31,5 @@ packages: - '@1.2.1 ~mkl' py-numpy: require:: - - '@:1.25 ^openblas' + - '@:1.23 ^openblas' # *DH diff --git a/configs/sites/tier1/derecho/packages_intel.yaml b/configs/sites/tier1/derecho/packages_intel.yaml index f37ddcacf..dc534a575 100644 --- a/configs/sites/tier1/derecho/packages_intel.yaml +++ b/configs/sites/tier1/derecho/packages_intel.yaml @@ -37,6 +37,6 @@ packages: - '@1.2.1 ~mkl' py-numpy: require:: - - '@:1.25 ^openblas' + - '@:1.23 ^openblas' # *DH diff --git a/configs/sites/tier1/gaea-c5/packages.yaml b/configs/sites/tier1/gaea-c5/packages.yaml index da5173fad..6e13f710e 100644 --- a/configs/sites/tier1/gaea-c5/packages.yaml +++ b/configs/sites/tier1/gaea-c5/packages.yaml @@ -35,7 +35,7 @@ packages: - '@1.2.1 ~mkl' py-numpy: require:: - - '@:1.25 ^openblas' + - '@:1.23 ^openblas' # *DH ### All other external packages listed alphabetically diff --git a/configs/sites/tier1/gaea-c6/packages.yaml b/configs/sites/tier1/gaea-c6/packages.yaml index 92f7d0a7c..75473846c 100644 --- a/configs/sites/tier1/gaea-c6/packages.yaml +++ b/configs/sites/tier1/gaea-c6/packages.yaml @@ -34,7 +34,7 @@ packages: - '@1.2.1 ~mkl' py-numpy: require:: - - '@:1.25 ^openblas' + - '@:1.23 ^openblas' # *DH ### All other external packages listed alphabetically diff --git a/configs/sites/tier1/hera/packages_intel.yaml b/configs/sites/tier1/hera/packages_intel.yaml index 4f8025c5f..5ac52dd8b 100644 --- a/configs/sites/tier1/hera/packages_intel.yaml +++ b/configs/sites/tier1/hera/packages_intel.yaml @@ -30,7 +30,7 @@ packages: - '@1.2.1 ~mkl' py-numpy: require:: - - '@:1.25 ^openblas' + - '@:1.23 ^openblas' # *DH zlib-ng: require: diff --git a/configs/sites/tier1/hercules/packages_intel.yaml b/configs/sites/tier1/hercules/packages_intel.yaml index 78339c1c5..eb4a22dc7 100644 --- a/configs/sites/tier1/hercules/packages_intel.yaml +++ b/configs/sites/tier1/hercules/packages_intel.yaml @@ -30,4 +30,4 @@ packages: - '@1.2.1 ~mkl' py-numpy: require:: - - '@:1.25 ^openblas' + - '@:1.23 ^openblas' diff --git a/configs/sites/tier1/nautilus/packages_gcc.yaml b/configs/sites/tier1/nautilus/packages_gcc.yaml index 841ff05b1..723bfd315 100644 --- a/configs/sites/tier1/nautilus/packages_gcc.yaml +++ b/configs/sites/tier1/nautilus/packages_gcc.yaml @@ -31,4 +31,4 @@ packages: - '@1.2.1 +mkl' py-numpy: require:: - - '@:1.25 ^intel-oneapi-mkl' + - '@:1.23 ^intel-oneapi-mkl' diff --git a/configs/sites/tier1/noaa-aws/packages_intel.yaml b/configs/sites/tier1/noaa-aws/packages_intel.yaml index 995404d2d..2c98fa98f 100644 --- a/configs/sites/tier1/noaa-aws/packages_intel.yaml +++ b/configs/sites/tier1/noaa-aws/packages_intel.yaml @@ -30,5 +30,5 @@ packages: - '@1.2.1 ~mkl' py-numpy: require:: - - '@:1.25 ^openblas' + - '@:1.23 ^openblas' # *DH diff --git a/configs/sites/tier1/noaa-azure/packages_intel.yaml b/configs/sites/tier1/noaa-azure/packages_intel.yaml index 995404d2d..2c98fa98f 100644 --- a/configs/sites/tier1/noaa-azure/packages_intel.yaml +++ b/configs/sites/tier1/noaa-azure/packages_intel.yaml @@ -30,5 +30,5 @@ packages: - '@1.2.1 ~mkl' py-numpy: require:: - - '@:1.25 ^openblas' + - '@:1.23 ^openblas' # *DH diff --git a/configs/sites/tier1/noaa-gcloud/packages_intel.yaml b/configs/sites/tier1/noaa-gcloud/packages_intel.yaml index 995404d2d..2c98fa98f 100644 --- a/configs/sites/tier1/noaa-gcloud/packages_intel.yaml +++ b/configs/sites/tier1/noaa-gcloud/packages_intel.yaml @@ -30,5 +30,5 @@ packages: - '@1.2.1 ~mkl' py-numpy: require:: - - '@:1.25 ^openblas' + - '@:1.23 ^openblas' # *DH diff --git a/configs/sites/tier1/orion/packages_intel.yaml b/configs/sites/tier1/orion/packages_intel.yaml index 88131d85c..8c1e33385 100644 --- a/configs/sites/tier1/orion/packages_intel.yaml +++ b/configs/sites/tier1/orion/packages_intel.yaml @@ -32,4 +32,4 @@ packages: - '@1.2.1 ~mkl' py-numpy: require:: - - '@:1.25 ^openblas' + - '@:1.23 ^openblas' diff --git a/configs/sites/tier1/s4/packages.yaml b/configs/sites/tier1/s4/packages.yaml index 3650e0678..e0312b799 100644 --- a/configs/sites/tier1/s4/packages.yaml +++ b/configs/sites/tier1/s4/packages.yaml @@ -33,7 +33,7 @@ packages: - '@1.2.1 ~mkl' py-numpy: require:: - - '@:1.25 ^openblas' + - '@:1.23 ^openblas' ### All other external packages listed alphabetically autoconf: