From bebb1bb6d3ebf27b8c2a2b45fbe998ef6248039a Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 28 Aug 2026 12:31:44 -0500 Subject: [PATCH 1/3] chore: podio-1.8 --- spack-environment/packages.yaml | 4 ++-- spack-packages.sh | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 76c21ee6..7b1f2e01 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -442,9 +442,9 @@ packages: - '@1.0.0' podio: require: - - '@1.7' + - '@1.8' - cxxstd=20 - - +datasource +rntuple + - +arrow +datasource +parquet +rntuple package_attributes: run_tests: true prmon: diff --git a/spack-packages.sh b/spack-packages.sh index 9d4ac0d5..9989ea15 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -38,6 +38,10 @@ b7819dfb21e2716761e0a99bc93a851eef0e6343 0e793b360b1383044923a19146f7d977f3107a41 4c53d69e7e02fb346500b6269e43a26d1010d0f7 ded706e8eb08bae4ac1cd4618c594bee4040a00e +e2a49ec27bbe7a64f1388d296d139754af5f79f4 +5d79a44c68046e528f78b3f5e4b42754c1e05c93 +818143ef3d6c7f52474e8ff22472247b94ace049 +409826414a2221be56011f8f0f912905dae558cd --- ## Optional hash table with comma-separated file list ## For these commits, the cherry-pick will be restricted to the listed files only. @@ -73,3 +77,7 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 0e793b360b1383044923a19146f7d977f3107a41: pandora*: Update PandoraPFA repository URLs ## 4c53d69e7e02fb346500b6269e43a26d1010d0f7: pandora*: add v5.* ## ded706e8eb08bae4ac1cd4618c594bee4040a00e: acts: pass root variant to examples +## e2a49ec27bbe7a64f1388d296d139754af5f79f4: podio: add arrow variant +## 5d79a44c68046e528f78b3f5e4b42754c1e05c93: podio,sio: url_for_version for main version +## 818143ef3d6c7f52474e8ff22472247b94ace049: dd4hep: url_for_version for master version +## 409826414a2221be56011f8f0f912905dae558cd: podio: Add version 1.8 and new parquet variant From c24d1a8103b243d0753d79cac486d07d3292f65f Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 28 Aug 2026 12:44:51 -0500 Subject: [PATCH 2/3] fix: spack cherry-pick: podio: add a patch to be able to build with fmt 12 --- spack-packages.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/spack-packages.sh b/spack-packages.sh index 9989ea15..4f6fe227 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -38,9 +38,10 @@ b7819dfb21e2716761e0a99bc93a851eef0e6343 0e793b360b1383044923a19146f7d977f3107a41 4c53d69e7e02fb346500b6269e43a26d1010d0f7 ded706e8eb08bae4ac1cd4618c594bee4040a00e -e2a49ec27bbe7a64f1388d296d139754af5f79f4 -5d79a44c68046e528f78b3f5e4b42754c1e05c93 -818143ef3d6c7f52474e8ff22472247b94ace049 +c44cd71db91d6e6c68cb604dcb87311b49b1bedb +33d01efa54ffc5b211cd5abc2df74841c032a722 +7e581611d81312d2a4228ad5d0b67bdd93217915 +683c5a698d88d657a99f3adefee0fe98d30927ae 409826414a2221be56011f8f0f912905dae558cd --- ## Optional hash table with comma-separated file list @@ -77,7 +78,8 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 0e793b360b1383044923a19146f7d977f3107a41: pandora*: Update PandoraPFA repository URLs ## 4c53d69e7e02fb346500b6269e43a26d1010d0f7: pandora*: add v5.* ## ded706e8eb08bae4ac1cd4618c594bee4040a00e: acts: pass root variant to examples -## e2a49ec27bbe7a64f1388d296d139754af5f79f4: podio: add arrow variant -## 5d79a44c68046e528f78b3f5e4b42754c1e05c93: podio,sio: url_for_version for main version -## 818143ef3d6c7f52474e8ff22472247b94ace049: dd4hep: url_for_version for master version +## c44cd71db91d6e6c68cb604dcb87311b49b1bedb: podio: add a patch to be able to build with fmt 12 +## 33d01efa54ffc5b211cd5abc2df74841c032a722: podio: add arrow variant +## 7e581611d81312d2a4228ad5d0b67bdd93217915: podio,sio: url_for_version for main version +## 683c5a698d88d657a99f3adefee0fe98d30927ae: dd4hep: url_for_version for master version ## 409826414a2221be56011f8f0f912905dae558cd: podio: Add version 1.8 and new parquet variant From 9a702a738c1e23f85a48437be2d44f27c76b62a1 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 28 Aug 2026 14:59:31 -0500 Subject: [PATCH 3/3] fix: spack cherry-pick: edm4hep: patch for new podio arrow targets --- spack-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack-packages.sh b/spack-packages.sh index 4f6fe227..1ded817d 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -43,6 +43,7 @@ c44cd71db91d6e6c68cb604dcb87311b49b1bedb 7e581611d81312d2a4228ad5d0b67bdd93217915 683c5a698d88d657a99f3adefee0fe98d30927ae 409826414a2221be56011f8f0f912905dae558cd +63b8b9c3ac8ddcb2b9aafcd8160ff33bd6210f51 --- ## Optional hash table with comma-separated file list ## For these commits, the cherry-pick will be restricted to the listed files only. @@ -83,3 +84,4 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 7e581611d81312d2a4228ad5d0b67bdd93217915: podio,sio: url_for_version for main version ## 683c5a698d88d657a99f3adefee0fe98d30927ae: dd4hep: url_for_version for master version ## 409826414a2221be56011f8f0f912905dae558cd: podio: Add version 1.8 and new parquet variant +## 63b8b9c3ac8ddcb2b9aafcd8160ff33bd6210f51: edm4hep: patch for new podio arrow targets