From 932c1adee83ef5449a02041111c3dbf1bf4fb193 Mon Sep 17 00:00:00 2001 From: Francois Hebert Date: Mon, 17 Nov 2025 19:26:59 +0000 Subject: [PATCH 1/6] Update ECMWF libs ecbuild, eckit, fckit, atlas, fiat, ectrans --- configs/common/packages.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index c184c8eda..098fa3fb8 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -55,7 +55,7 @@ packages: - +fix ecbuild: require: - - '@3.7.2' + - '@3.12.0' eccodes: require: - '@2.33.0' @@ -66,15 +66,15 @@ packages: - +ui eckit: require: - - '@1.28.3' + - '@1.32.3' - linalg=eigen,lapack compression=lz4,bzip2 ecmwf-atlas: require: - - '@0.40.0' + - '@0.44.1' - +fckit +trans +tesselation +fftw ectrans: require: - - '@1.5.0' + - '@1.7.0' eigen: require: - '@3.4.0' @@ -93,14 +93,14 @@ packages: - ~libbsd fckit: require: - - '@0.13.2' + - '@0.14.1' - +eckit fftw: require: - '@3.3.10' fiat: require: - - '@1.4.1' + - '@1.6.1' flex: require: - '@2.6.4' From a411ba55ab0f15381dfe3ab9ee25b0b24e1568a8 Mon Sep 17 00:00:00 2001 From: Francois Hebert Date: Mon, 17 Nov 2025 19:28:25 +0000 Subject: [PATCH 2/6] Point submodule to spack-packages fork with new verions --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 068339c16..e26815cc0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,5 +10,5 @@ branch = v1.3.0 [submodule "repos/builtin"] path = repos/builtin - url = https://github.com/jcsda/spack-packages - branch = spack-stack-dev + url = https://github.com/fmahebert/spack-packages + branch = feature/spack-stack-dev-with-new-atlas-and-deps From 22880b250929d1e6bcda32c889bd0e5c850e7114 Mon Sep 17 00:00:00 2001 From: Francois Hebert Date: Mon, 17 Nov 2025 21:25:42 +0000 Subject: [PATCH 3/6] Update spack-packages submodule version --- repos/builtin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/builtin b/repos/builtin index bfc55569e..1d570d772 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit bfc55569ef288de441a42131f58579e8b7fe64a0 +Subproject commit 1d570d7720a3e3c4b4b329481d22807c58155e7f From 30ae7cb7a7dd2af96a4b9d84bf54ac5ffb159725 Mon Sep 17 00:00:00 2001 From: Francois Hebert Date: Mon, 17 Nov 2025 23:47:32 +0000 Subject: [PATCH 4/6] Update spack-packages submodule after merge --- repos/builtin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/builtin b/repos/builtin index 1d570d772..9556e196a 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 1d570d7720a3e3c4b4b329481d22807c58155e7f +Subproject commit 9556e196a5204ab6bdb4e46a7a4787ee0d8e3d92 From b56cea5b01ddd570e6e4d1b959b181a3bc3d884b Mon Sep 17 00:00:00 2001 From: Francois Hebert Date: Tue, 18 Nov 2025 16:29:06 +0000 Subject: [PATCH 5/6] Revert "Point submodule to spack-packages fork with new verions" This reverts commit a411ba55ab0f15381dfe3ab9ee25b0b24e1568a8. --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index e26815cc0..068339c16 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,5 +10,5 @@ branch = v1.3.0 [submodule "repos/builtin"] path = repos/builtin - url = https://github.com/fmahebert/spack-packages - branch = feature/spack-stack-dev-with-new-atlas-and-deps + url = https://github.com/jcsda/spack-packages + branch = spack-stack-dev From 62727ddcf3f7b1eee4ecb1e887d9c28da4f073af Mon Sep 17 00:00:00 2001 From: Francois Hebert Date: Tue, 18 Nov 2025 17:56:03 +0000 Subject: [PATCH 6/6] Return spack-packages submodule pointer to JCSDA fork --- repos/builtin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/builtin b/repos/builtin index 9556e196a..ea29f111c 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 9556e196a5204ab6bdb4e46a7a4787ee0d8e3d92 +Subproject commit ea29f111cf324a64d0d8bca1e8ecebc399cc6edd