From 0193bf4f518ea8100c594d107210213da8afab9f Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 28 Nov 2025 10:50:40 -0600 Subject: [PATCH 1/9] chore: podio-1.6 --- spack-environment/packages.yaml | 2 +- spack-packages.sh | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 5db76af9..b96673ae 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -316,7 +316,7 @@ packages: - '@1.0.0' podio: require: - - '@1.3' + - '@1.6' - cxxstd=20 - +rntuple package_attributes: diff --git a/spack-packages.sh b/spack-packages.sh index 78622020..babd9adc 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -46,6 +46,10 @@ c4d983b764d7b1ee2b63da79f5f25365ac61ce7a 5c37f836753e8f9683fdc547f3661c5045abcbd1 c75e10845431600b163c597545bd099e427c62f5 438a7d95de1b81e15107edbf341b20824ec80635 +c71f8e48245012565ac7b0648dfda137b0071de7 +8d027b1651840631350d0ba9f30624f2baf26350 +566e1b070e17ffe8c2d0bf4122568af8a81db1cd +048bffaea064919ccfc2f740e14bbb987e7f5c7e --- ## Optional hash table with comma-separated file list read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ @@ -93,3 +97,7 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 5c37f836753e8f9683fdc547f3661c5045abcbd1: root: require openblas ~ilp64 symbol_suffix=none when ^openblas ## c75e10845431600b163c597545bd099e427c62f5: dd4hep: v1.33 ## 438a7d95de1b81e15107edbf341b20824ec80635: root: add v6.36.06 +## c71f8e48245012565ac7b0648dfda137b0071de7: podio: Add latest tag 1.4 and 1.4.1 +## 8d027b1651840631350d0ba9f30624f2baf26350: podio: Add version 1.5 +## 566e1b070e17ffe8c2d0bf4122568af8a81db1cd: podio: add v1.6 +## 048bffaea064919ccfc2f740e14bbb987e7f5c7e: podio: Add the conditional value 23 for cxxstd From 57260991ea5e88dc19daf8858bf9cfd7ec10ce8d Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 28 Nov 2025 11:05:41 -0600 Subject: [PATCH 2/9] fix: spack cherry-pick: Deprecation removals: P (limited to podio) --- spack-packages.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spack-packages.sh b/spack-packages.sh index babd9adc..9edd404f 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -47,6 +47,7 @@ c4d983b764d7b1ee2b63da79f5f25365ac61ce7a c75e10845431600b163c597545bd099e427c62f5 438a7d95de1b81e15107edbf341b20824ec80635 c71f8e48245012565ac7b0648dfda137b0071de7 +4ef82e75f5cae7b4d093e41043e26b259498264e 8d027b1651840631350d0ba9f30624f2baf26350 566e1b070e17ffe8c2d0bf4122568af8a81db1cd 048bffaea064919ccfc2f740e14bbb987e7f5c7e @@ -56,6 +57,7 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ --- || true [b063312bb52fb62010e04588f6b16d37e16c8d02]=repos/spack_repo/builtin/packages/py_tensorflow/package.py [7fad8a78d35b5556e1d7aa92a71a4e1c58a1665a]=repos/spack_repo/builtin/packages/py_tensorflow/package.py,repos/spack_repo/builtin/packages/py_tensorboard/package.py +[4ef82e75f5cae7b4d093e41043e26b259498264e]=repos/spack_repo/builtin/packages/podio/package.py --- ## Ref: https://github.com/spack/spack-packages/commit/[hash] ## [hash]: [description] @@ -98,6 +100,7 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## c75e10845431600b163c597545bd099e427c62f5: dd4hep: v1.33 ## 438a7d95de1b81e15107edbf341b20824ec80635: root: add v6.36.06 ## c71f8e48245012565ac7b0648dfda137b0071de7: podio: Add latest tag 1.4 and 1.4.1 +## 4ef82e75f5cae7b4d093e41043e26b259498264e: Deprecation removals: P ## 8d027b1651840631350d0ba9f30624f2baf26350: podio: Add version 1.5 ## 566e1b070e17ffe8c2d0bf4122568af8a81db1cd: podio: add v1.6 ## 048bffaea064919ccfc2f740e14bbb987e7f5c7e: podio: Add the conditional value 23 for cxxstd From e44dfcd5fc80fa88ba6768efee6c47f958557ee2 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 28 Nov 2025 12:44:58 -0600 Subject: [PATCH 3/9] chore: jana2-2.4.3 --- spack-environment/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index b96673ae..c6e3d046 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -223,7 +223,7 @@ packages: - '@0.23' jana2: require: - - '@2.4.2' + - '@2.4.3' - -ipo +podio +root +zmq juggler: require: From 7ddeee63891116393f2c362acfaa1af3093f1fb1 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 28 Nov 2025 14:40:16 -0600 Subject: [PATCH 4/9] fix: juggler to fixed commit avoiding collection dereference --- spack-environment/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index c6e3d046..e5463622 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -227,7 +227,7 @@ packages: - -ipo +podio +root +zmq juggler: require: - - '@15.0.2' # JUGGLER_VERSION + - '@git.03a0fdcb0d712e60120b21fb56049129da7ade9e=15.0.2' # JUGGLER_VERSION - cxxstd=20 julia: require: From 87fc858b9258647b092beecc3213486d755dccb1 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 28 Nov 2025 16:06:12 -0600 Subject: [PATCH 5/9] Update Juggler version reference in packages.yaml --- spack-environment/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index e5463622..d058ea5e 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -227,7 +227,7 @@ packages: - -ipo +podio +root +zmq juggler: require: - - '@git.03a0fdcb0d712e60120b21fb56049129da7ade9e=15.0.2' # JUGGLER_VERSION + - '@git.e6258c6a98d514db9270403c2fa29a3c215f7b8e=15.0.2' # JUGGLER_VERSION - cxxstd=20 julia: require: From 48a0fc7db4bbd0480aad78c4fe21a441aab4c163 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 28 Nov 2025 18:36:51 -0600 Subject: [PATCH 6/9] chore: juggler-15.0.3 --- spack-environment/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index d058ea5e..97761101 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -227,7 +227,7 @@ packages: - -ipo +podio +root +zmq juggler: require: - - '@git.e6258c6a98d514db9270403c2fa29a3c215f7b8e=15.0.2' # JUGGLER_VERSION + - '@15.0.3' # JUGGLER_VERSION - cxxstd=20 julia: require: From ebe43e7386548685c8de2ff8c3b507fcfc2c9c64 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 28 Nov 2025 19:26:13 -0600 Subject: [PATCH 7/9] fix: eic-spack: juggler: add v15.0.3 --- eic-spack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eic-spack.sh b/eic-spack.sh index 412e9485..0bae9979 100644 --- a/eic-spack.sh +++ b/eic-spack.sh @@ -3,4 +3,4 @@ EICSPACK_ORGREPO="eic/eic-spack" ## EIC spack commit hash or github version, e.g. v0.19.7 ## note: nightly builds could use a branch e.g. releases/v0.19 -EICSPACK_VERSION="2ac6537435128a2dae054ab14a0bbf23f4fb0fb1" +EICSPACK_VERSION="f4236f3c2edd6bfc8e0d6dfcdf3e0d0ac6dc5b0b" From 6ceaf0816671b5b5c913f4b21bd692fa5d70c743 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sat, 29 Nov 2025 09:22:32 -0600 Subject: [PATCH 8/9] fix: spack cherry-pick: podio: ensure Python.h is found in ROOT ACLiC --- spack-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack-packages.sh b/spack-packages.sh index 9edd404f..a4927929 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -51,6 +51,7 @@ c71f8e48245012565ac7b0648dfda137b0071de7 8d027b1651840631350d0ba9f30624f2baf26350 566e1b070e17ffe8c2d0bf4122568af8a81db1cd 048bffaea064919ccfc2f740e14bbb987e7f5c7e +6b57d7a93de84dd5492b9308a9612924ab641dce --- ## Optional hash table with comma-separated file list read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ @@ -104,3 +105,4 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 8d027b1651840631350d0ba9f30624f2baf26350: podio: Add version 1.5 ## 566e1b070e17ffe8c2d0bf4122568af8a81db1cd: podio: add v1.6 ## 048bffaea064919ccfc2f740e14bbb987e7f5c7e: podio: Add the conditional value 23 for cxxstd +## 6b57d7a93de84dd5492b9308a9612924ab641dce: podio: ensure Python.h is found in ROOT ACLiC From 6a75c2fcb62b61ad741d029cf112d2243bf2d7ea Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sat, 29 Nov 2025 13:53:49 -0600 Subject: [PATCH 9/9] fix: spack cherry-pick: podio: use headers.directories[0] to get str, not list --- spack-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack-packages.sh b/spack-packages.sh index a4927929..4bc4c538 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -52,6 +52,7 @@ c71f8e48245012565ac7b0648dfda137b0071de7 566e1b070e17ffe8c2d0bf4122568af8a81db1cd 048bffaea064919ccfc2f740e14bbb987e7f5c7e 6b57d7a93de84dd5492b9308a9612924ab641dce +ba94c07db577eaf5eb4b0450721fbc7e98879922 --- ## Optional hash table with comma-separated file list read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ @@ -106,3 +107,4 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 566e1b070e17ffe8c2d0bf4122568af8a81db1cd: podio: add v1.6 ## 048bffaea064919ccfc2f740e14bbb987e7f5c7e: podio: Add the conditional value 23 for cxxstd ## 6b57d7a93de84dd5492b9308a9612924ab641dce: podio: ensure Python.h is found in ROOT ACLiC +## ba94c07db577eaf5eb4b0450721fbc7e98879922: podio: use headers.directories[0] to get str, not list