From 12ed139a152ad618cd86049e74c974fb1ed459fc Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sun, 19 Jan 2025 07:39:59 -0700 Subject: [PATCH 1/4] With gcc@10 and earlier, must use cdo@2.3.0 --- configs/common/packages.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 9bae2c5c1..d2eeb1edd 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -30,6 +30,9 @@ packages: - any_of: ['@2.3.0 ~openmp'] when: '%intel@2021:' message: '2.3.0 is the last version to use C++17, use with Intel Classic' + - any_of: ['@2.3.0 ~openmp'] + when: '%gcc@:10' + message: 2.3.0 is the last version to use C++17, use with GCC 10 and earlier - any_of: ['@2.3.0 ~openmp'] when: '%apple-clang@:14' message: '2.3.0 is the last version to use C++17, use with Apple Clang 14 and earlier' From 07b3bdcc2cc58c4528e203e269f0bd8800c7cd1d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 21 Jan 2025 14:00:42 -0700 Subject: [PATCH 2/4] Update submodule pointer for spack --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index ffeffba28..0ee54ff84 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit ffeffba282acd873a288efb9dbb8e964f128c7e4 +Subproject commit 0ee54ff840d4a4bf78ca1e102681bb48a4e53f33 From 2be38adc242e919e1494f71e30a9ac00123e64be Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 21 Jan 2025 14:01:04 -0700 Subject: [PATCH 3/4] Add py-wheel, py-setuptools, py-setuptools-scm to base-env --- spack-ext/repos/spack-stack/packages/base-env/package.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spack-ext/repos/spack-stack/packages/base-env/package.py b/spack-ext/repos/spack-stack/packages/base-env/package.py index deec53e44..13c43b2d7 100644 --- a/spack-ext/repos/spack-stack/packages/base-env/package.py +++ b/spack-ext/repos/spack-stack/packages/base-env/package.py @@ -38,5 +38,8 @@ class BaseEnv(BundlePackage): # Python depends_on("python@3.7:", type="run") depends_on("py-pip", type="run") + depends_on("py-wheel", type="run") + depends_on("py-setuptools", type="run") + depends_on("py-setuptools-scm", type="run") # There is no need for install() since there is no code. From 34a40b7d12640b72c2fcfff74e70641e0396c6b9 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 21 Jan 2025 14:02:30 -0700 Subject: [PATCH 4/4] Add py-numpy and py-netcdf4 to ccpp-scm template --- configs/templates/ccpp-scm/spack.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/templates/ccpp-scm/spack.yaml b/configs/templates/ccpp-scm/spack.yaml index 07ee4ff2d..7bdebca4a 100644 --- a/configs/templates/ccpp-scm/spack.yaml +++ b/configs/templates/ccpp-scm/spack.yaml @@ -20,4 +20,5 @@ spack: - sp - w3emc - py-f90nml - + - py-numpy + - py-netcdf4