From fddf5764b8eb8605cdef633bb93454bc231957f6 Mon Sep 17 00:00:00 2001 From: nnellen <193914323+nnellen@users.noreply.github.com> Date: Tue, 3 Feb 2026 11:59:09 +0100 Subject: [PATCH 01/18] update to fdb 5.19.0 --- recipes/fdb/5.18/environments.yaml | 2 +- recipes/fdb/5.18/repo/packages/fdb/package.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/fdb/5.18/environments.yaml b/recipes/fdb/5.18/environments.yaml index 34350cd..321cea5 100644 --- a/recipes/fdb/5.18/environments.yaml +++ b/recipes/fdb/5.18/environments.yaml @@ -6,7 +6,7 @@ fdb: mpi: null packages: [] specs: - - fdb@=5.18.3 backends=lustre + - fdb@=5.19.0 backends=lustre - gribjump@=0.10.2 - eckit@=1.32.3 linalg=none - metkit@=1.15.2-levelist diff --git a/recipes/fdb/5.18/repo/packages/fdb/package.py b/recipes/fdb/5.18/repo/packages/fdb/package.py index 6a341e3..60b4052 100644 --- a/recipes/fdb/5.18/repo/packages/fdb/package.py +++ b/recipes/fdb/5.18/repo/packages/fdb/package.py @@ -19,6 +19,7 @@ class Fdb(CMakePackage): license("Apache-2.0") version("master", branch="master") + version("5.19.0", sha256="1275c4b89dcdfcb342a255e22a7d500070d5d32251910c4c2a10d5734c0590eb") version("5.18.3", sha256="8b6fff6c32923bd8e456f2ec1540b171b4efdbf92e81ae2e5ff2967dec224a86") version("5.18.0", sha256="d72c7180b9c0e3048a19bc60df6f2827e7849dea8299b7d3f21d5ffb7fc99951") version("5.17.3", sha256="b477f95a00bd0177e26490e0d0911679aba9183c53ac525625fe1665487068d0") From 2862e1e2368caa4cc4bca39281a80ce63c984dc5 Mon Sep 17 00:00:00 2001 From: nnellen <193914323+nnellen@users.noreply.github.com> Date: Tue, 3 Feb 2026 14:37:35 +0100 Subject: [PATCH 02/18] update config to 5.19 --- config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config.yaml b/config.yaml index e298a84..c62c3ad 100644 --- a/config.yaml +++ b/config.yaml @@ -33,11 +33,11 @@ uenvs: deploy: balfrin: [zen3, a100] fdb: - "5.18": + "5.19": recipes: - zen2: '5.18' - zen3: '5.18' - a100: '5.18' + zen2: '5.19' + zen3: '5.19' + a100: '5.19' icon: "25.2": recipes: From 89272048ac8755843d46794efe4367caeceb0aaa Mon Sep 17 00:00:00 2001 From: nnellen <193914323+nnellen@users.noreply.github.com> Date: Tue, 3 Feb 2026 15:29:10 +0100 Subject: [PATCH 03/18] remove zen2 and a100 --- config.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/config.yaml b/config.yaml index c62c3ad..39adb90 100644 --- a/config.yaml +++ b/config.yaml @@ -35,9 +35,7 @@ uenvs: fdb: "5.19": recipes: - zen2: '5.19' zen3: '5.19' - a100: '5.19' icon: "25.2": recipes: From c62f5563d73aa6ac6d470ef65501bd715f2c9269 Mon Sep 17 00:00:00 2001 From: nnellen <193914323+nnellen@users.noreply.github.com> Date: Tue, 3 Feb 2026 16:52:33 +0100 Subject: [PATCH 04/18] rename fdb file to 5.19 --- recipes/fdb/{5.18 => 5.19}/compilers.yaml | 0 recipes/fdb/{5.18 => 5.19}/config.yaml | 0 recipes/fdb/{5.18 => 5.19}/environments.yaml | 0 recipes/fdb/{5.18 => 5.19}/meta/private/expand_language.py | 0 recipes/fdb/{5.18 => 5.19}/meta/private/expand_params.py | 0 .../fdb/{5.18 => 5.19}/meta/private/fdb_config/rea-l-ch1.schema | 0 recipes/fdb/{5.18 => 5.19}/meta/private/fdb_config/rea-l-ch1.yaml | 0 .../fdb/{5.18 => 5.19}/meta/private/fdb_config/realtime.schema | 0 recipes/fdb/{5.18 => 5.19}/meta/private/fdb_config/realtime.yaml | 0 .../fdb/{5.18 => 5.19}/meta/private/fdb_config/remote-depl.yaml | 0 .../fdb/{5.18 => 5.19}/meta/private/fdb_config/remote-devt.yaml | 0 recipes/fdb/{5.18 => 5.19}/meta/private/pyproject.toml | 0 recipes/fdb/{5.18 => 5.19}/meta/private/uenv_param_map.py | 0 recipes/fdb/{5.18 => 5.19}/packages.yaml | 0 recipes/fdb/{5.18 => 5.19}/post-install | 0 recipes/fdb/{5.18 => 5.19}/repo/packages/ecbuild/package.py | 0 .../repo/packages/eccodes/cmake_install_rpath.patch | 0 .../{5.18 => 5.19}/repo/packages/eccodes/openjpeg_jasper.patch | 0 recipes/fdb/{5.18 => 5.19}/repo/packages/eccodes/package.py | 0 recipes/fdb/{5.18 => 5.19}/repo/packages/eckit/package.py | 0 recipes/fdb/{5.18 => 5.19}/repo/packages/fdb/metkit_1.7.0.patch | 0 recipes/fdb/{5.18 => 5.19}/repo/packages/fdb/package.py | 0 recipes/fdb/{5.18 => 5.19}/repo/packages/gribjump/package.py | 0 recipes/fdb/{5.18 => 5.19}/repo/packages/libaec/package.py | 0 recipes/fdb/{5.18 => 5.19}/repo/packages/metkit/package.py | 0 25 files changed, 0 insertions(+), 0 deletions(-) rename recipes/fdb/{5.18 => 5.19}/compilers.yaml (100%) rename recipes/fdb/{5.18 => 5.19}/config.yaml (100%) rename recipes/fdb/{5.18 => 5.19}/environments.yaml (100%) rename recipes/fdb/{5.18 => 5.19}/meta/private/expand_language.py (100%) rename recipes/fdb/{5.18 => 5.19}/meta/private/expand_params.py (100%) rename recipes/fdb/{5.18 => 5.19}/meta/private/fdb_config/rea-l-ch1.schema (100%) rename recipes/fdb/{5.18 => 5.19}/meta/private/fdb_config/rea-l-ch1.yaml (100%) rename recipes/fdb/{5.18 => 5.19}/meta/private/fdb_config/realtime.schema (100%) rename recipes/fdb/{5.18 => 5.19}/meta/private/fdb_config/realtime.yaml (100%) rename recipes/fdb/{5.18 => 5.19}/meta/private/fdb_config/remote-depl.yaml (100%) rename recipes/fdb/{5.18 => 5.19}/meta/private/fdb_config/remote-devt.yaml (100%) rename recipes/fdb/{5.18 => 5.19}/meta/private/pyproject.toml (100%) rename recipes/fdb/{5.18 => 5.19}/meta/private/uenv_param_map.py (100%) rename recipes/fdb/{5.18 => 5.19}/packages.yaml (100%) rename recipes/fdb/{5.18 => 5.19}/post-install (100%) rename recipes/fdb/{5.18 => 5.19}/repo/packages/ecbuild/package.py (100%) rename recipes/fdb/{5.18 => 5.19}/repo/packages/eccodes/cmake_install_rpath.patch (100%) rename recipes/fdb/{5.18 => 5.19}/repo/packages/eccodes/openjpeg_jasper.patch (100%) rename recipes/fdb/{5.18 => 5.19}/repo/packages/eccodes/package.py (100%) rename recipes/fdb/{5.18 => 5.19}/repo/packages/eckit/package.py (100%) rename recipes/fdb/{5.18 => 5.19}/repo/packages/fdb/metkit_1.7.0.patch (100%) rename recipes/fdb/{5.18 => 5.19}/repo/packages/fdb/package.py (100%) rename recipes/fdb/{5.18 => 5.19}/repo/packages/gribjump/package.py (100%) rename recipes/fdb/{5.18 => 5.19}/repo/packages/libaec/package.py (100%) rename recipes/fdb/{5.18 => 5.19}/repo/packages/metkit/package.py (100%) diff --git a/recipes/fdb/5.18/compilers.yaml b/recipes/fdb/5.19/compilers.yaml similarity index 100% rename from recipes/fdb/5.18/compilers.yaml rename to recipes/fdb/5.19/compilers.yaml diff --git a/recipes/fdb/5.18/config.yaml b/recipes/fdb/5.19/config.yaml similarity index 100% rename from recipes/fdb/5.18/config.yaml rename to recipes/fdb/5.19/config.yaml diff --git a/recipes/fdb/5.18/environments.yaml b/recipes/fdb/5.19/environments.yaml similarity index 100% rename from recipes/fdb/5.18/environments.yaml rename to recipes/fdb/5.19/environments.yaml diff --git a/recipes/fdb/5.18/meta/private/expand_language.py b/recipes/fdb/5.19/meta/private/expand_language.py similarity index 100% rename from recipes/fdb/5.18/meta/private/expand_language.py rename to recipes/fdb/5.19/meta/private/expand_language.py diff --git a/recipes/fdb/5.18/meta/private/expand_params.py b/recipes/fdb/5.19/meta/private/expand_params.py similarity index 100% rename from recipes/fdb/5.18/meta/private/expand_params.py rename to recipes/fdb/5.19/meta/private/expand_params.py diff --git a/recipes/fdb/5.18/meta/private/fdb_config/rea-l-ch1.schema b/recipes/fdb/5.19/meta/private/fdb_config/rea-l-ch1.schema similarity index 100% rename from recipes/fdb/5.18/meta/private/fdb_config/rea-l-ch1.schema rename to recipes/fdb/5.19/meta/private/fdb_config/rea-l-ch1.schema diff --git a/recipes/fdb/5.18/meta/private/fdb_config/rea-l-ch1.yaml b/recipes/fdb/5.19/meta/private/fdb_config/rea-l-ch1.yaml similarity index 100% rename from recipes/fdb/5.18/meta/private/fdb_config/rea-l-ch1.yaml rename to recipes/fdb/5.19/meta/private/fdb_config/rea-l-ch1.yaml diff --git a/recipes/fdb/5.18/meta/private/fdb_config/realtime.schema b/recipes/fdb/5.19/meta/private/fdb_config/realtime.schema similarity index 100% rename from recipes/fdb/5.18/meta/private/fdb_config/realtime.schema rename to recipes/fdb/5.19/meta/private/fdb_config/realtime.schema diff --git a/recipes/fdb/5.18/meta/private/fdb_config/realtime.yaml b/recipes/fdb/5.19/meta/private/fdb_config/realtime.yaml similarity index 100% rename from recipes/fdb/5.18/meta/private/fdb_config/realtime.yaml rename to recipes/fdb/5.19/meta/private/fdb_config/realtime.yaml diff --git a/recipes/fdb/5.18/meta/private/fdb_config/remote-depl.yaml b/recipes/fdb/5.19/meta/private/fdb_config/remote-depl.yaml similarity index 100% rename from recipes/fdb/5.18/meta/private/fdb_config/remote-depl.yaml rename to recipes/fdb/5.19/meta/private/fdb_config/remote-depl.yaml diff --git a/recipes/fdb/5.18/meta/private/fdb_config/remote-devt.yaml b/recipes/fdb/5.19/meta/private/fdb_config/remote-devt.yaml similarity index 100% rename from recipes/fdb/5.18/meta/private/fdb_config/remote-devt.yaml rename to recipes/fdb/5.19/meta/private/fdb_config/remote-devt.yaml diff --git a/recipes/fdb/5.18/meta/private/pyproject.toml b/recipes/fdb/5.19/meta/private/pyproject.toml similarity index 100% rename from recipes/fdb/5.18/meta/private/pyproject.toml rename to recipes/fdb/5.19/meta/private/pyproject.toml diff --git a/recipes/fdb/5.18/meta/private/uenv_param_map.py b/recipes/fdb/5.19/meta/private/uenv_param_map.py similarity index 100% rename from recipes/fdb/5.18/meta/private/uenv_param_map.py rename to recipes/fdb/5.19/meta/private/uenv_param_map.py diff --git a/recipes/fdb/5.18/packages.yaml b/recipes/fdb/5.19/packages.yaml similarity index 100% rename from recipes/fdb/5.18/packages.yaml rename to recipes/fdb/5.19/packages.yaml diff --git a/recipes/fdb/5.18/post-install b/recipes/fdb/5.19/post-install similarity index 100% rename from recipes/fdb/5.18/post-install rename to recipes/fdb/5.19/post-install diff --git a/recipes/fdb/5.18/repo/packages/ecbuild/package.py b/recipes/fdb/5.19/repo/packages/ecbuild/package.py similarity index 100% rename from recipes/fdb/5.18/repo/packages/ecbuild/package.py rename to recipes/fdb/5.19/repo/packages/ecbuild/package.py diff --git a/recipes/fdb/5.18/repo/packages/eccodes/cmake_install_rpath.patch b/recipes/fdb/5.19/repo/packages/eccodes/cmake_install_rpath.patch similarity index 100% rename from recipes/fdb/5.18/repo/packages/eccodes/cmake_install_rpath.patch rename to recipes/fdb/5.19/repo/packages/eccodes/cmake_install_rpath.patch diff --git a/recipes/fdb/5.18/repo/packages/eccodes/openjpeg_jasper.patch b/recipes/fdb/5.19/repo/packages/eccodes/openjpeg_jasper.patch similarity index 100% rename from recipes/fdb/5.18/repo/packages/eccodes/openjpeg_jasper.patch rename to recipes/fdb/5.19/repo/packages/eccodes/openjpeg_jasper.patch diff --git a/recipes/fdb/5.18/repo/packages/eccodes/package.py b/recipes/fdb/5.19/repo/packages/eccodes/package.py similarity index 100% rename from recipes/fdb/5.18/repo/packages/eccodes/package.py rename to recipes/fdb/5.19/repo/packages/eccodes/package.py diff --git a/recipes/fdb/5.18/repo/packages/eckit/package.py b/recipes/fdb/5.19/repo/packages/eckit/package.py similarity index 100% rename from recipes/fdb/5.18/repo/packages/eckit/package.py rename to recipes/fdb/5.19/repo/packages/eckit/package.py diff --git a/recipes/fdb/5.18/repo/packages/fdb/metkit_1.7.0.patch b/recipes/fdb/5.19/repo/packages/fdb/metkit_1.7.0.patch similarity index 100% rename from recipes/fdb/5.18/repo/packages/fdb/metkit_1.7.0.patch rename to recipes/fdb/5.19/repo/packages/fdb/metkit_1.7.0.patch diff --git a/recipes/fdb/5.18/repo/packages/fdb/package.py b/recipes/fdb/5.19/repo/packages/fdb/package.py similarity index 100% rename from recipes/fdb/5.18/repo/packages/fdb/package.py rename to recipes/fdb/5.19/repo/packages/fdb/package.py diff --git a/recipes/fdb/5.18/repo/packages/gribjump/package.py b/recipes/fdb/5.19/repo/packages/gribjump/package.py similarity index 100% rename from recipes/fdb/5.18/repo/packages/gribjump/package.py rename to recipes/fdb/5.19/repo/packages/gribjump/package.py diff --git a/recipes/fdb/5.18/repo/packages/libaec/package.py b/recipes/fdb/5.19/repo/packages/libaec/package.py similarity index 100% rename from recipes/fdb/5.18/repo/packages/libaec/package.py rename to recipes/fdb/5.19/repo/packages/libaec/package.py diff --git a/recipes/fdb/5.18/repo/packages/metkit/package.py b/recipes/fdb/5.19/repo/packages/metkit/package.py similarity index 100% rename from recipes/fdb/5.18/repo/packages/metkit/package.py rename to recipes/fdb/5.19/repo/packages/metkit/package.py From e211b4a39fdca8833b34b09ac874c9d9260a19f8 Mon Sep 17 00:00:00 2001 From: nnellen <193914323+nnellen@users.noreply.github.com> Date: Tue, 3 Feb 2026 17:17:20 +0100 Subject: [PATCH 05/18] add zen2 and a100 --- config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config.yaml b/config.yaml index 39adb90..c62c3ad 100644 --- a/config.yaml +++ b/config.yaml @@ -35,7 +35,9 @@ uenvs: fdb: "5.19": recipes: + zen2: '5.19' zen3: '5.19' + a100: '5.19' icon: "25.2": recipes: From 695c05b95e252edb3be46f435a5fc1c65d1f93b5 Mon Sep 17 00:00:00 2001 From: nnellen <193914323+nnellen@users.noreply.github.com> Date: Wed, 4 Feb 2026 12:14:16 +0100 Subject: [PATCH 06/18] update eckit --- recipes/fdb/5.19/environments.yaml | 2 +- recipes/fdb/5.19/repo/packages/eckit/package.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/fdb/5.19/environments.yaml b/recipes/fdb/5.19/environments.yaml index 321cea5..070c7b1 100644 --- a/recipes/fdb/5.19/environments.yaml +++ b/recipes/fdb/5.19/environments.yaml @@ -8,7 +8,7 @@ fdb: specs: - fdb@=5.19.0 backends=lustre - gribjump@=0.10.2 - - eckit@=1.32.3 linalg=none + - eckit@=1.33.0 linalg=none - metkit@=1.15.2-levelist - eccodes@=2.39.5 jp2k=none ~fortran +pthreads +aec - ecbuild@=3.12.0 diff --git a/recipes/fdb/5.19/repo/packages/eckit/package.py b/recipes/fdb/5.19/repo/packages/eckit/package.py index 2a16c8a..5ccf87f 100644 --- a/recipes/fdb/5.19/repo/packages/eckit/package.py +++ b/recipes/fdb/5.19/repo/packages/eckit/package.py @@ -20,6 +20,7 @@ class Eckit(CMakePackage): license("Apache-2.0") + version("1.33.0", sha256="a15f89df0cdaa2d8a74843a1e72a7b3b304958a4fe119b51eec5efadbf113d4f") version("1.32.3", sha256="33e0fac2656cdd2f2d877dbfe7a4751ee657ab732c00dd90bd48a406298a100f") version("1.32.2", sha256="f2940e99f1550119497418221e4c5073eb9c3ea776b15a4f56236ef4438a1210") version("1.31.4", sha256="045ebd9aaecf2773dc8c82f4226022776576cb0d911a76f8d1d069c97e9530c8") From 9f3963191541969e3fb2e2a7f3a427dfc7bc5250 Mon Sep 17 00:00:00 2001 From: nnellen <193914323+nnellen@users.noreply.github.com> Date: Fri, 6 Mar 2026 14:57:25 +0100 Subject: [PATCH 07/18] update lib version to be compatible with fdb 5.19.1 --- recipes/fdb/5.19/environments.yaml | 8 ++++---- recipes/fdb/5.19/repo/packages/eccodes/package.py | 1 + recipes/fdb/5.19/repo/packages/eckit/package.py | 1 + recipes/fdb/5.19/repo/packages/fdb/package.py | 2 ++ recipes/fdb/5.19/repo/packages/metkit/package.py | 4 ++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/recipes/fdb/5.19/environments.yaml b/recipes/fdb/5.19/environments.yaml index 070c7b1..718447c 100644 --- a/recipes/fdb/5.19/environments.yaml +++ b/recipes/fdb/5.19/environments.yaml @@ -6,11 +6,11 @@ fdb: mpi: null packages: [] specs: - - fdb@=5.19.0 backends=lustre + - fdb@=5.19.1 backends=lustre - gribjump@=0.10.2 - - eckit@=1.33.0 linalg=none - - metkit@=1.15.2-levelist - - eccodes@=2.39.5 jp2k=none ~fortran +pthreads +aec + - eckit@=2.0.2 linalg=none + - metkit@=1.16.3-levelist + - eccodes@=2.46.0 jp2k=none ~fortran +pthreads +aec - ecbuild@=3.12.0 - python@=3.11.6 variants: diff --git a/recipes/fdb/5.19/repo/packages/eccodes/package.py b/recipes/fdb/5.19/repo/packages/eccodes/package.py index 836b865..41f9425 100644 --- a/recipes/fdb/5.19/repo/packages/eccodes/package.py +++ b/recipes/fdb/5.19/repo/packages/eccodes/package.py @@ -50,6 +50,7 @@ class Eccodes(CMakePackage): version("develop", branch="develop") + version("2.46.0", sha256="7d959253d5e34aeb16caa14d4889ac06486d19821216743142733a32ee7b4935") version("2.42.0", sha256="60371b357cb011dee546db2eabace5b7e27f0f87d3ea4a5adde7891371b3c128") version("2.39.5", git="https://github.com/ecmwf/eccodes.git", tag="2.39.5") version("2.39.0", sha256="0c4d746700acc49af9c878925f1b26bdd42443ff7c2d7c676deb2babb6847afb") diff --git a/recipes/fdb/5.19/repo/packages/eckit/package.py b/recipes/fdb/5.19/repo/packages/eckit/package.py index 5ccf87f..f374fa8 100644 --- a/recipes/fdb/5.19/repo/packages/eckit/package.py +++ b/recipes/fdb/5.19/repo/packages/eckit/package.py @@ -20,6 +20,7 @@ class Eckit(CMakePackage): license("Apache-2.0") + version("2.0.2", sha256="46b9c1f90e0b565698c5c79c54676401d33738ec82995c025d5d5aabeb13ad2b") version("1.33.0", sha256="a15f89df0cdaa2d8a74843a1e72a7b3b304958a4fe119b51eec5efadbf113d4f") version("1.32.3", sha256="33e0fac2656cdd2f2d877dbfe7a4751ee657ab732c00dd90bd48a406298a100f") version("1.32.2", sha256="f2940e99f1550119497418221e4c5073eb9c3ea776b15a4f56236ef4438a1210") diff --git a/recipes/fdb/5.19/repo/packages/fdb/package.py b/recipes/fdb/5.19/repo/packages/fdb/package.py index 60b4052..2749e77 100644 --- a/recipes/fdb/5.19/repo/packages/fdb/package.py +++ b/recipes/fdb/5.19/repo/packages/fdb/package.py @@ -19,6 +19,8 @@ class Fdb(CMakePackage): license("Apache-2.0") version("master", branch="master") + + version("5.19.1", sha256="de5edddd4c17cb4ddfe61bfed60a6b37408d5ed92a2d19a493592e1abfe65a8d") version("5.19.0", sha256="1275c4b89dcdfcb342a255e22a7d500070d5d32251910c4c2a10d5734c0590eb") version("5.18.3", sha256="8b6fff6c32923bd8e456f2ec1540b171b4efdbf92e81ae2e5ff2967dec224a86") version("5.18.0", sha256="d72c7180b9c0e3048a19bc60df6f2827e7849dea8299b7d3f21d5ffb7fc99951") diff --git a/recipes/fdb/5.19/repo/packages/metkit/package.py b/recipes/fdb/5.19/repo/packages/metkit/package.py index 58f245a..c495c7d 100644 --- a/recipes/fdb/5.19/repo/packages/metkit/package.py +++ b/recipes/fdb/5.19/repo/packages/metkit/package.py @@ -18,6 +18,10 @@ class Metkit(CMakePackage): license("Apache-2.0") + version( + "1.16.3-levelist", + sha256="90bd8ca8be1c954f8d6af44b5a416c7357a37bcc9247fa3cdec8ec5cb7c411d0", + ) version( "1.15.2-levelist", sha256="25cebe7610949848671131ee3681e3e7e01d376e7b74e1a269872b9fba15ab54", From 5f8d416b7fc815255016f6d320219b627a8efe86 Mon Sep 17 00:00:00 2001 From: Lasse Meinen Date: Mon, 9 Mar 2026 14:52:35 +0100 Subject: [PATCH 08/18] include changes from other version testing branch --- config.yaml | 4 ++-- recipes/fdb/5.19/environments.yaml | 10 +++++----- recipes/fdb/5.19/repo/packages/ecbuild/package.py | 3 +++ recipes/fdb/5.19/repo/packages/eccodes/package.py | 6 ++++++ recipes/fdb/5.19/repo/packages/eckit/package.py | 1 + recipes/fdb/5.19/repo/packages/fdb/package.py | 2 ++ recipes/fdb/5.19/repo/packages/gribjump/package.py | 3 +++ recipes/fdb/5.19/repo/packages/metkit/package.py | 12 ++++++++---- 8 files changed, 30 insertions(+), 11 deletions(-) diff --git a/config.yaml b/config.yaml index c62c3ad..7b4f419 100644 --- a/config.yaml +++ b/config.yaml @@ -5,12 +5,12 @@ clusters: uarch: 'a100' partition: 'normal' variables: - F7T_URL: 'https://api.cscs.ch/mch/firecrest/v1' + F7T_URL: 'https://api.cscs.ch/mch/firecrest/v2' - uarch: 'zen3' partition: 'postproc' variables: - F7T_URL: 'https://api.cscs.ch/mch/firecrest/v1' + F7T_URL: 'https://api.cscs.ch/mch/firecrest/v2' SLURM_EXCLUSIVE: '' SLURM_NODES: '1' SLURM_CPU_BIND: 'none' diff --git a/recipes/fdb/5.19/environments.yaml b/recipes/fdb/5.19/environments.yaml index 718447c..3d6b70f 100644 --- a/recipes/fdb/5.19/environments.yaml +++ b/recipes/fdb/5.19/environments.yaml @@ -6,12 +6,12 @@ fdb: mpi: null packages: [] specs: - - fdb@=5.19.1 backends=lustre - - gribjump@=0.10.2 - - eckit@=2.0.2 linalg=none + - fdb@=5.19.2 backends=lustre + - gribjump@=0.10.3 + - eckit@=2.0.2 linalg=none compression=lz4 +curl +ssl - metkit@=1.16.3-levelist - - eccodes@=2.46.0 jp2k=none ~fortran +pthreads +aec - - ecbuild@=3.12.0 + - eccodes@=2.46.0 jp2k=none ~fortran +pthreads +aec +geo + - ecbuild@=3.13.1 - python@=3.11.6 variants: - ~mpi diff --git a/recipes/fdb/5.19/repo/packages/ecbuild/package.py b/recipes/fdb/5.19/repo/packages/ecbuild/package.py index 965ab0d..4b80d5e 100644 --- a/recipes/fdb/5.19/repo/packages/ecbuild/package.py +++ b/recipes/fdb/5.19/repo/packages/ecbuild/package.py @@ -12,11 +12,14 @@ class Ecbuild(CMakePackage): homepage = "https://github.com/ecmwf/ecbuild" url = "https://github.com/ecmwf/ecbuild/archive/refs/tags/3.6.1.tar.gz" + list_url = "https://github.com/ecmwf/ecbuild/tags" maintainers("skosukhin", "climbfuji", "victoria-cherkas", "dominichofer") license("Apache-2.0") + version("3.13.1", sha256="9759815aef22c9154589ea025056db086c575af9dac635614b561ab825f9477e") + version("3.13.0", sha256="7be83510e7209c61273121bcf817780597c3afa41a5129bfccc281f0df1ffda1") version("3.12.0", sha256="70c7fc9b17f736a3312167c2c36d13b3b5833a255fe2b168b2886ad7c743ffdf") version("3.11.0", sha256="38a96bdeb38feb65446b6f95b35492232abd188c41b8a28fd128f9f88e00b05d") version("3.10.0", sha256="7065e1725584b507517cbfc456299ff588e20adf37bc6210ce89fb65a1ad08d0") diff --git a/recipes/fdb/5.19/repo/packages/eccodes/package.py b/recipes/fdb/5.19/repo/packages/eccodes/package.py index 41f9425..96eb14a 100644 --- a/recipes/fdb/5.19/repo/packages/eccodes/package.py +++ b/recipes/fdb/5.19/repo/packages/eccodes/package.py @@ -100,6 +100,8 @@ class Eccodes(CMakePackage): description="List of extra definitions to install", ) + variant("geo", default=False, description="Enable eckit::geo") + depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated depends_on("fortran", type="build") # generated @@ -127,6 +129,8 @@ class Eccodes(CMakePackage): conflicts("+openmp", when="+pthreads", msg="Cannot enable both POSIX threads and OMP") + depends_on("eckit", when="+geo") + conflicts( "+netcdf", when="~tools", @@ -326,6 +330,8 @@ def cmake_args(self): self.define_from_variant("ENABLE_ECCODES_THREADS", "pthreads"), self.define_from_variant("ENABLE_ECCODES_OMP_THREADS", "openmp"), self.define_from_variant("ENABLE_MEMFS", "memfs"), + self.define_from_variant("ENABLE_GEOGRAPHY", "geo"), + self.define_from_variant("ENABLE_ECKIT_GEO", "geo"), self.define( "ENABLE_PYTHON{0}".format("2" if self.spec.satisfies("@2.20.0:") else ""), False ), diff --git a/recipes/fdb/5.19/repo/packages/eckit/package.py b/recipes/fdb/5.19/repo/packages/eckit/package.py index f374fa8..2be4198 100644 --- a/recipes/fdb/5.19/repo/packages/eckit/package.py +++ b/recipes/fdb/5.19/repo/packages/eckit/package.py @@ -15,6 +15,7 @@ class Eckit(CMakePackage): homepage = "https://github.com/ecmwf/eckit" git = "https://github.com/ecmwf/eckit.git" url = "https://github.com/ecmwf/eckit/archive/refs/tags/1.16.0.tar.gz" + list_url = "https://github.com/ecmwf/eckit/tags" maintainers("skosukhin", "climbfuji", "victoria-cherkas", "dominichofer") diff --git a/recipes/fdb/5.19/repo/packages/fdb/package.py b/recipes/fdb/5.19/repo/packages/fdb/package.py index 2749e77..deeb462 100644 --- a/recipes/fdb/5.19/repo/packages/fdb/package.py +++ b/recipes/fdb/5.19/repo/packages/fdb/package.py @@ -13,6 +13,7 @@ class Fdb(CMakePackage): homepage = "https://github.com/ecmwf/fdb" url = "https://github.com/ecmwf/fdb/archive/refs/tags/5.7.8.tar.gz" git = "https://github.com/ecmwf/fdb.git" + list_url = "https://github.com/ecmwf/fdb/tags" maintainers("skosukhin", "victoria-cherkas", "dominichofer") @@ -20,6 +21,7 @@ class Fdb(CMakePackage): version("master", branch="master") + version("5.19.2", sha256="7dfffd7279a53431fe11a82b5c6dcc94f42bc5100a0ff925fe0b54de94d1cfe2") version("5.19.1", sha256="de5edddd4c17cb4ddfe61bfed60a6b37408d5ed92a2d19a493592e1abfe65a8d") version("5.19.0", sha256="1275c4b89dcdfcb342a255e22a7d500070d5d32251910c4c2a10d5734c0590eb") version("5.18.3", sha256="8b6fff6c32923bd8e456f2ec1540b171b4efdbf92e81ae2e5ff2967dec224a86") diff --git a/recipes/fdb/5.19/repo/packages/gribjump/package.py b/recipes/fdb/5.19/repo/packages/gribjump/package.py index 8178bc1..51609eb 100644 --- a/recipes/fdb/5.19/repo/packages/gribjump/package.py +++ b/recipes/fdb/5.19/repo/packages/gribjump/package.py @@ -14,10 +14,13 @@ class Gribjump(CMakePackage): homepage = "https://github.com/ecmwf/gribjump" url = "https://github.com/ecmwf/gribjump/archive/refs/tags/0.10.0.tar.gz" git = "https://github.com/ecmwf/gribjump.git" + list_url = "https://github.com/ecmwf/gribjump/tags" maintainers("cosunae") license("Apache-2.0") + + version("0.10.3", sha256="8001f8a0e4b03664134ea42612d22d6499e098d2063b12182030986895689f6c") version("0.10.2", sha256="c1635c1f902daa244592b60c9b1a81375b467409635bd2cbfc6993d32554bd3d") version("0.10.0", sha256="04a6c7322e585acb7e432e74d68f073ab584a42af9dcb2b4b97f17aebf17d07f") diff --git a/recipes/fdb/5.19/repo/packages/metkit/package.py b/recipes/fdb/5.19/repo/packages/metkit/package.py index c495c7d..3ebfd80 100644 --- a/recipes/fdb/5.19/repo/packages/metkit/package.py +++ b/recipes/fdb/5.19/repo/packages/metkit/package.py @@ -13,15 +13,19 @@ class Metkit(CMakePackage): homepage = "https://github.com/ecmwf/metkit" git = "https://github.com/ecmwf/metkit.git" url = "https://github.com/ecmwf/metkit/archive/refs/tags/1.7.0.tar.gz" + list_url = "https://github.com/ecmwf/metkit/tags" maintainers("skosukhin", "victoria-cherkas", "dominichofer") license("Apache-2.0") - version( - "1.16.3-levelist", - sha256="90bd8ca8be1c954f8d6af44b5a416c7357a37bcc9247fa3cdec8ec5cb7c411d0", - ) + version("1.17.0", sha256="0fb4cae8cf440f6589b426cbddf8fd37434bc59e178b34df6b7633bfdbb47de3") + version("1.16.3-levelist", sha256="90bd8ca8be1c954f8d6af44b5a416c7357a37bcc9247fa3cdec8ec5cb7c411d0") + version("1.16.3", sha256="b2da2ce50aac68365506c7fb8661889df61a01e53ca7e8f699fe9d3015d44974") + version("1.16.2", sha256="30a65a2cc14942e7ce64ea5539a1b6b85ecce336811014aba70e1f4f9e651f68") + version("1.16.1", sha256="0520cba65afeaede6553c8b62941e67c0f88123602e19d0898538a52e2b0f522") + version("1.16.0", sha256="7b93e4fc1608c1ac205fbf3e094d50ba8a88e7223b65eab7a12362f55550c8e1") + version("1.15.9", sha256="19e656fdafd52375d076303f710bfb71d24298866960e479082d7cb8c730efee") version( "1.15.2-levelist", sha256="25cebe7610949848671131ee3681e3e7e01d376e7b74e1a269872b9fba15ab54", From 058977e8e0df1902cce70c28a69d3851de9f63c2 Mon Sep 17 00:00:00 2001 From: nnellen <193914323+nnellen@users.noreply.github.com> Date: Tue, 10 Mar 2026 14:20:16 +0100 Subject: [PATCH 09/18] Update earthkit-data version to 0.19.0 --- recipes/fdb/5.19/meta/private/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/fdb/5.19/meta/private/pyproject.toml b/recipes/fdb/5.19/meta/private/pyproject.toml index 990e4b5..48c3527 100644 --- a/recipes/fdb/5.19/meta/private/pyproject.toml +++ b/recipes/fdb/5.19/meta/private/pyproject.toml @@ -17,7 +17,7 @@ ipykernel = "*" earthkit-plots = "*" earthkit-geo = "*" earthkit-meteo = "*" -earthkit-data = ">=0.16.3" +earthkit-data = ">=0.19.0" pygribjump = { git = "https://github.com/ecmwf/gribjump.git", tag = "0.10.2" } polytope-client = "^0.7.8" nbconvert = "*" From 1b47f2630ddd15a1ebaf3cdf80a19ca7af0949d0 Mon Sep 17 00:00:00 2001 From: Simon Bolt Date: Wed, 11 Mar 2026 16:19:12 +0100 Subject: [PATCH 10/18] update python environment --- recipes/fdb/5.19/meta/private/pyproject.toml | 35 ++++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/recipes/fdb/5.19/meta/private/pyproject.toml b/recipes/fdb/5.19/meta/private/pyproject.toml index 48c3527..4d4e0ae 100644 --- a/recipes/fdb/5.19/meta/private/pyproject.toml +++ b/recipes/fdb/5.19/meta/private/pyproject.toml @@ -7,22 +7,51 @@ description = "Demo scripts and notebooks for reading and processing forecast da authors = ["MeteoSwiss"] package-mode = false +[[tool.poetry.source]] +name = "pypi-mch" +url = "https://service.meteoswiss.ch/nexus/repository/python-all/simple" +priority = "primary" + +[[tool.poetry.source]] +name = "pypi" +priority = "supplemental" + +[[tool.poetry.source]] +name = "testpypi" +url = "https://test.pypi.org/simple/" +priority = "supplemental" + [tool.poetry.dependencies] python = "~3.11" -meteodata-lab = {version = "0.6.0", extras = ["polytope", "regrid"]} +# need to update meteodata-lab to support newer eccodes +#meteodata-lab = {version = "0.6.0", extras = ["polytope", "regrid"]} # version > 0.1.1 of pyfdb requires eccodes >= 2.39 pyfdb = "0.1.3" fdb-utils = { git = "https://github.com/MeteoSwiss/fdb-utils.git", tag = "v1.3.5"} +earthkit-plots = "^0.6.0" +earthkit-regrid = { git = "https://github.com/ecmwf/earthkit-regrid.git", branch = "develop" } ipykernel = "*" -earthkit-plots = "*" earthkit-geo = "*" earthkit-meteo = "*" -earthkit-data = ">=0.19.0" +earthkit-data = "^0.19.0" pygribjump = { git = "https://github.com/ecmwf/gribjump.git", tag = "0.10.2" } polytope-client = "^0.7.8" nbconvert = "*" +nbformat = "*" pyyaml = "*" kaleido = "0.2.1" +eccodes = "^2.46.0" + +# MCH internal pypi (until officially published by DWD) +eccodes-cosmo-resources-python-internal = {version = "^2.44.0.1", source = "pypi-mch"} + +# TestPyPI dev builds +eckit = { version = "2.0.3.dev43", source = "testpypi" } +eckitlib = { version = "2.0.3.dev43", source = "testpypi" } +mirlib = { version = "1.28.1.dev43", source = "testpypi" } +mir-python = {version = "^1.27.11.dev26", allow-prereleases = true} +eccodeslib = {version = "2.47.1.dev43", source = "testpypi"} + [tool.pytest.ini_options] testpaths = ["test"] From 31137364fd9af4411718ba31aab331c6f9494adb Mon Sep 17 00:00:00 2001 From: Simon Bolt Date: Thu, 12 Mar 2026 15:22:27 +0100 Subject: [PATCH 11/18] update eccodes cosmo resources --- recipes/fdb/5.19/post-install | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/recipes/fdb/5.19/post-install b/recipes/fdb/5.19/post-install index 07bc76d..7c1f15b 100755 --- a/recipes/fdb/5.19/post-install +++ b/recipes/fdb/5.19/post-install @@ -12,10 +12,13 @@ set -e rm -rf /user-environment/data/share mkdir -p /user-environment/data/share pushd /user-environment/data/share -wget https://opendata.dwd.de/weather/lib/grib/eccodes_definitions.edzw-2.38.3-1.tar.bz2 -bunzip2 eccodes_definitions.edzw-2.38.3-1.tar.bz2 -tar xvf eccodes_definitions.edzw-2.38.3-1.tar -rm eccodes_definitions.edzw-2.38.3-1.tar +# eccodes cosmo definitions: since the updated defs are not published by DWD yet, +# they are instead provided by the corresponding internal python package; see var +# 'eccodes_cosmo_resources_path' below +#wget https://opendata.dwd.de/weather/lib/grib/eccodes_definitions.edzw-2.38.3-1.tar.bz2 +#bunzip2 eccodes_definitions.edzw-2.38.3-1.tar.bz2 +#tar xvf eccodes_definitions.edzw-2.38.3-1.tar +#rm eccodes_definitions.edzw-2.38.3-1.tar git clone -b v0.0.4 https://github.com/MeteoSwiss/eccodes-cosmo-mars.git popd @@ -33,11 +36,14 @@ source /user-environment/venvs/fdb/bin/activate /user-environment/bin/poetry install popd +# determine path of eccodes cosmo resources from python package +eccodes_cosmo_resources_path=$(python -c "import eccodes_cosmo_resources as res; print(res.get_definitions_path())") + # --- Expand metkit tables with ICON parameter, model, and stream definitions -- metkit_dir=$(dirname $(find $install_root -name language.yaml)) -python /user-environment/meta/recipe/meta/private/expand_params.py ${metkit_dir}/paramids.yaml /user-environment/data/share/definitions.edzw-2.38.3-1/grib2/shortName.def,/user-environment/data/share/definitions.edzw-2.38.3-1/grib2/localConcepts/edzw/shortName.def -python /user-environment/meta/recipe/meta/private/expand_language.py ${metkit_dir}/language.yaml +python /user-environment/meta/recipe/meta/private/expand_params.py ${metkit_dir}/paramids.yaml ${eccodes_cosmo_resources_path}/grib2/shortName.def,${eccodes_cosmo_resources_path}/grib2/localConcepts/edzw/shortName.def +python /user-environment/meta/recipe/meta/private/expand_language.py ${metkit_dir}/language.yaml # --- Configure FDB views and runtime environment ------------------------------ fdb_config_dir="/user-environment/meta/recipe/meta/private/fdb_config" @@ -55,7 +61,7 @@ do config_file="${views[$view]}" jq --arg view "$view" --arg env "/user-environment/env/$view" '.views[$view].env.values.list.FDB_HOME = [{"op":"prepend","value":[$env]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" --arg env "/user-environment/env/$view" '.views[$view].env.values.list.FDB5_HOME = [{"op":"prepend","value":[$env]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json - jq --arg view "$view" '.views[$view].env.values.list.GRIB_DEFINITION_PATH = [{"op":"prepend","value":["/user-environment/data/share/eccodes-cosmo-mars/definitions", "/user-environment/data/share/definitions.edzw-2.38.3-1","/user-environment/env/fdb/share/eccodes/definitions"]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json + jq --arg view "$view" --arg eccodes_cosmo_resources_path "$eccodes_cosmo_resources_path" '.views[$view].env.values.list.GRIB_DEFINITION_PATH = [{"op":"prepend","value":["/user-environment/data/share/eccodes-cosmo-mars/definitions", "$eccodes_cosmo_resources_path","/user-environment/env/fdb/share/eccodes/definitions"]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" '.views[$view].env.values.list.PATH[0].value |= ["/user-environment/venvs/fdb/bin/"] + .' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" '.views[$view].env.values.list.FDB_ENABLE_GRIBJUMP = [{"op":"set","value":"1"}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" '.views[$view].env.values.list.AUTO_LOAD_PLUGINS = [{"op":"set","value":"1"}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json From 3c34aff32326a993313a62962fa9070fe9dd4005 Mon Sep 17 00:00:00 2001 From: Simon Bolt Date: Thu, 12 Mar 2026 15:49:01 +0100 Subject: [PATCH 12/18] attempt to fix cosmo resources path substitution --- recipes/fdb/5.19/post-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/fdb/5.19/post-install b/recipes/fdb/5.19/post-install index 7c1f15b..3102b73 100755 --- a/recipes/fdb/5.19/post-install +++ b/recipes/fdb/5.19/post-install @@ -61,7 +61,7 @@ do config_file="${views[$view]}" jq --arg view "$view" --arg env "/user-environment/env/$view" '.views[$view].env.values.list.FDB_HOME = [{"op":"prepend","value":[$env]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" --arg env "/user-environment/env/$view" '.views[$view].env.values.list.FDB5_HOME = [{"op":"prepend","value":[$env]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json - jq --arg view "$view" --arg eccodes_cosmo_resources_path "$eccodes_cosmo_resources_path" '.views[$view].env.values.list.GRIB_DEFINITION_PATH = [{"op":"prepend","value":["/user-environment/data/share/eccodes-cosmo-mars/definitions", "$eccodes_cosmo_resources_path","/user-environment/env/fdb/share/eccodes/definitions"]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json + jq --arg view "$view" --arg eccodes_cosmo_resources_path "$eccodes_cosmo_resources_path" '.views[$view].env.values.list.GRIB_DEFINITION_PATH = [{"op":"prepend","value":["/user-environment/data/share/eccodes-cosmo-mars/definitions",$eccodes_cosmo_resources_path,"/user-environment/env/fdb/share/eccodes/definitions"]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" '.views[$view].env.values.list.PATH[0].value |= ["/user-environment/venvs/fdb/bin/"] + .' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" '.views[$view].env.values.list.FDB_ENABLE_GRIBJUMP = [{"op":"set","value":"1"}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" '.views[$view].env.values.list.AUTO_LOAD_PLUGINS = [{"op":"set","value":"1"}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json From a96a981f5caf6ed503ba9984db361fb5dcfff233 Mon Sep 17 00:00:00 2001 From: Simon Bolt Date: Thu, 12 Mar 2026 16:12:56 +0100 Subject: [PATCH 13/18] set ECCODES_ECKIT_GEO=1 by default --- recipes/fdb/5.19/environments.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/recipes/fdb/5.19/environments.yaml b/recipes/fdb/5.19/environments.yaml index 3d6b70f..8c1efa7 100644 --- a/recipes/fdb/5.19/environments.yaml +++ b/recipes/fdb/5.19/environments.yaml @@ -19,20 +19,32 @@ fdb: realtime: link: roots uenv: + env-vars: + set: + - ECCODES_ECKIT_GEO: "1" prefix_paths: LD_LIBRARY_PATH: [lib, lib64] rea-l-ch1: link: roots uenv: + env-vars: + set: + - ECCODES_ECKIT_GEO: "1" prefix_paths: LD_LIBRARY_PATH: [lib, lib64] remote-devt: link: roots uenv: + env-vars: + set: + - ECCODES_ECKIT_GEO: "1" prefix_paths: LD_LIBRARY_PATH: [lib, lib64] remote-depl: link: roots uenv: + env-vars: + set: + - ECCODES_ECKIT_GEO: "1" prefix_paths: LD_LIBRARY_PATH: [lib, lib64] From 45d9c015865140164764a5992ca4ac37077cb3aa Mon Sep 17 00:00:00 2001 From: Simon Bolt Date: Thu, 12 Mar 2026 16:26:08 +0100 Subject: [PATCH 14/18] typo fix --- recipes/fdb/5.19/environments.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/fdb/5.19/environments.yaml b/recipes/fdb/5.19/environments.yaml index 8c1efa7..4ff3b5e 100644 --- a/recipes/fdb/5.19/environments.yaml +++ b/recipes/fdb/5.19/environments.yaml @@ -19,7 +19,7 @@ fdb: realtime: link: roots uenv: - env-vars: + env_vars: set: - ECCODES_ECKIT_GEO: "1" prefix_paths: @@ -27,7 +27,7 @@ fdb: rea-l-ch1: link: roots uenv: - env-vars: + env_vars: set: - ECCODES_ECKIT_GEO: "1" prefix_paths: @@ -35,7 +35,7 @@ fdb: remote-devt: link: roots uenv: - env-vars: + env_vars: set: - ECCODES_ECKIT_GEO: "1" prefix_paths: @@ -43,7 +43,7 @@ fdb: remote-depl: link: roots uenv: - env-vars: + env_vars: set: - ECCODES_ECKIT_GEO: "1" prefix_paths: From 0951b0358a3fc641d562a68ac19e9ee29f5949dc Mon Sep 17 00:00:00 2001 From: Simon Bolt Date: Thu, 12 Mar 2026 17:08:37 +0100 Subject: [PATCH 15/18] Revert 'set ECCODES_ECKIT_GEO=1 by default' (feature not supported by stackinator v5) --- recipes/fdb/5.19/environments.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/recipes/fdb/5.19/environments.yaml b/recipes/fdb/5.19/environments.yaml index 4ff3b5e..3d6b70f 100644 --- a/recipes/fdb/5.19/environments.yaml +++ b/recipes/fdb/5.19/environments.yaml @@ -19,32 +19,20 @@ fdb: realtime: link: roots uenv: - env_vars: - set: - - ECCODES_ECKIT_GEO: "1" prefix_paths: LD_LIBRARY_PATH: [lib, lib64] rea-l-ch1: link: roots uenv: - env_vars: - set: - - ECCODES_ECKIT_GEO: "1" prefix_paths: LD_LIBRARY_PATH: [lib, lib64] remote-devt: link: roots uenv: - env_vars: - set: - - ECCODES_ECKIT_GEO: "1" prefix_paths: LD_LIBRARY_PATH: [lib, lib64] remote-depl: link: roots uenv: - env_vars: - set: - - ECCODES_ECKIT_GEO: "1" prefix_paths: LD_LIBRARY_PATH: [lib, lib64] From 689db78078f67b228c87a046bbdb3e57b65aa999 Mon Sep 17 00:00:00 2001 From: Simon Bolt Date: Thu, 12 Mar 2026 17:47:46 +0100 Subject: [PATCH 16/18] set ECCODES_ECKIT_GEO=1 in post-install script --- recipes/fdb/5.19/post-install | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/fdb/5.19/post-install b/recipes/fdb/5.19/post-install index 3102b73..8f51cba 100755 --- a/recipes/fdb/5.19/post-install +++ b/recipes/fdb/5.19/post-install @@ -59,6 +59,7 @@ views=( for view in "${!views[@]}" do config_file="${views[$view]}" + jq --arg view "$view" '.views[$view].env.values.list.ECCODES_ECKIT_GEO = [{"op":"set","value":"1"}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" --arg env "/user-environment/env/$view" '.views[$view].env.values.list.FDB_HOME = [{"op":"prepend","value":[$env]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" --arg env "/user-environment/env/$view" '.views[$view].env.values.list.FDB5_HOME = [{"op":"prepend","value":[$env]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" --arg eccodes_cosmo_resources_path "$eccodes_cosmo_resources_path" '.views[$view].env.values.list.GRIB_DEFINITION_PATH = [{"op":"prepend","value":["/user-environment/data/share/eccodes-cosmo-mars/definitions",$eccodes_cosmo_resources_path,"/user-environment/env/fdb/share/eccodes/definitions"]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json From d207e2b00714d0e64307341d152a6b151d7316d7 Mon Sep 17 00:00:00 2001 From: Simon Bolt Date: Thu, 12 Mar 2026 18:40:27 +0100 Subject: [PATCH 17/18] try to fix env var --- recipes/fdb/5.19/post-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/fdb/5.19/post-install b/recipes/fdb/5.19/post-install index 8f51cba..0154643 100755 --- a/recipes/fdb/5.19/post-install +++ b/recipes/fdb/5.19/post-install @@ -59,7 +59,7 @@ views=( for view in "${!views[@]}" do config_file="${views[$view]}" - jq --arg view "$view" '.views[$view].env.values.list.ECCODES_ECKIT_GEO = [{"op":"set","value":"1"}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json + jq --arg view "$view" '.views[$view].env.values.list.ECCODES_ECKIT_GEO = [{"op":"set","value":["1"]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" --arg env "/user-environment/env/$view" '.views[$view].env.values.list.FDB_HOME = [{"op":"prepend","value":[$env]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" --arg env "/user-environment/env/$view" '.views[$view].env.values.list.FDB5_HOME = [{"op":"prepend","value":[$env]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" --arg eccodes_cosmo_resources_path "$eccodes_cosmo_resources_path" '.views[$view].env.values.list.GRIB_DEFINITION_PATH = [{"op":"prepend","value":["/user-environment/data/share/eccodes-cosmo-mars/definitions",$eccodes_cosmo_resources_path,"/user-environment/env/fdb/share/eccodes/definitions"]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json From 11b4debb14528f721ab53f3fe6fa0454cb62d16c Mon Sep 17 00:00:00 2001 From: Simon Bolt Date: Thu, 12 Mar 2026 20:05:22 +0100 Subject: [PATCH 18/18] fix more env vars --- recipes/fdb/5.19/post-install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/fdb/5.19/post-install b/recipes/fdb/5.19/post-install index 0154643..6e7b774 100755 --- a/recipes/fdb/5.19/post-install +++ b/recipes/fdb/5.19/post-install @@ -59,13 +59,13 @@ views=( for view in "${!views[@]}" do config_file="${views[$view]}" - jq --arg view "$view" '.views[$view].env.values.list.ECCODES_ECKIT_GEO = [{"op":"set","value":["1"]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" --arg env "/user-environment/env/$view" '.views[$view].env.values.list.FDB_HOME = [{"op":"prepend","value":[$env]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" --arg env "/user-environment/env/$view" '.views[$view].env.values.list.FDB5_HOME = [{"op":"prepend","value":[$env]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" --arg eccodes_cosmo_resources_path "$eccodes_cosmo_resources_path" '.views[$view].env.values.list.GRIB_DEFINITION_PATH = [{"op":"prepend","value":["/user-environment/data/share/eccodes-cosmo-mars/definitions",$eccodes_cosmo_resources_path,"/user-environment/env/fdb/share/eccodes/definitions"]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" '.views[$view].env.values.list.PATH[0].value |= ["/user-environment/venvs/fdb/bin/"] + .' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json - jq --arg view "$view" '.views[$view].env.values.list.FDB_ENABLE_GRIBJUMP = [{"op":"set","value":"1"}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json - jq --arg view "$view" '.views[$view].env.values.list.AUTO_LOAD_PLUGINS = [{"op":"set","value":"1"}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json + jq --arg view "$view" '.views[$view].env.values.list.FDB_ENABLE_GRIBJUMP = [{"op":"set","value":["1"]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json + jq --arg view "$view" '.views[$view].env.values.list.AUTO_LOAD_PLUGINS = [{"op":"set","value":["1"]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json + jq --arg view "$view" '.views[$view].env.values.list.ECCODES_ECKIT_GEO = [{"op":"set","value":["1"]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" --arg env "/user-environment/env/$view" '.views[$view].env.values.list.ECKIT_HOME = [{"op":"set","value":[$env]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json jq --arg view "$view" --arg config_file "$config_file" '.views[$view].env.values.list.FDB5_CONFIG_FILE = [{"op":"prepend","value":[$config_file]}]' store/meta/env.json > tmp.json && mv tmp.json store/meta/env.json