From 64a773fbcdbd53b345f62e73054dbc816b1844b2 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 29 Dec 2025 15:01:07 -0600 Subject: [PATCH 1/5] podio: conflicts ^python +freethreading --- repos/spack_repo/builtin/packages/podio/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/repos/spack_repo/builtin/packages/podio/package.py b/repos/spack_repo/builtin/packages/podio/package.py index e34acf46f41..57808994a8d 100644 --- a/repos/spack_repo/builtin/packages/podio/package.py +++ b/repos/spack_repo/builtin/packages/podio/package.py @@ -91,6 +91,7 @@ class Podio(CMakePackage): conflicts("+rntuple ^root@6.32:", when="@:0.99", msg="rntuple API change requires podio@1:") conflicts("+rntuple ^root@6.34:", when="@:1.1", msg="rntuple API change requires podio@1.2:") + conflicts("^python +freethreading", when="@:1.6", msg="python free-threading requires @1.7:") # See https://github.com/AIDASoft/podio/pull/600 patch( From 731503563b1a7b5618c0efd51651389ce0f214d6 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 29 Dec 2025 15:04:00 -0600 Subject: [PATCH 2/5] edm4hep: conflicts ^python +freethreading Add conflict for python free-threading requirement. --- repos/spack_repo/builtin/packages/edm4hep/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/repos/spack_repo/builtin/packages/edm4hep/package.py b/repos/spack_repo/builtin/packages/edm4hep/package.py index f37f3b1cc8e..d1373d2a314 100644 --- a/repos/spack_repo/builtin/packages/edm4hep/package.py +++ b/repos/spack_repo/builtin/packages/edm4hep/package.py @@ -77,6 +77,7 @@ class Edm4hep(CMakePackage): extends("python", when="@0.10.6:") conflicts("%clang@:16", when="@0.99.1:", msg="Incomplete consteval support in clang") + conflicts("^python +freethreading", when="@:0.99.4", msg="python free-threading requires @0.99.5:") # Fix missing nljson import # NOTE that downstream packages (dd4hep) may fail for 0.99 and before From 3745ffe34671b1aad7e8bae7176ea5bad7240abf Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 29 Dec 2025 20:52:32 -0600 Subject: [PATCH 3/5] podio, EDM4hep: improve conflicts msg Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- repos/spack_repo/builtin/packages/edm4hep/package.py | 6 +++++- repos/spack_repo/builtin/packages/podio/package.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/repos/spack_repo/builtin/packages/edm4hep/package.py b/repos/spack_repo/builtin/packages/edm4hep/package.py index d1373d2a314..056cc92b46f 100644 --- a/repos/spack_repo/builtin/packages/edm4hep/package.py +++ b/repos/spack_repo/builtin/packages/edm4hep/package.py @@ -77,7 +77,11 @@ class Edm4hep(CMakePackage): extends("python", when="@0.10.6:") conflicts("%clang@:16", when="@0.99.1:", msg="Incomplete consteval support in clang") - conflicts("^python +freethreading", when="@:0.99.4", msg="python free-threading requires @0.99.5:") + conflicts( + "^python +freethreading", + when="@:0.99.4", + msg="python free-threading requires edm4hep@0.99.5:", + ) # Fix missing nljson import # NOTE that downstream packages (dd4hep) may fail for 0.99 and before diff --git a/repos/spack_repo/builtin/packages/podio/package.py b/repos/spack_repo/builtin/packages/podio/package.py index 57808994a8d..84d36334b57 100644 --- a/repos/spack_repo/builtin/packages/podio/package.py +++ b/repos/spack_repo/builtin/packages/podio/package.py @@ -91,7 +91,7 @@ class Podio(CMakePackage): conflicts("+rntuple ^root@6.32:", when="@:0.99", msg="rntuple API change requires podio@1:") conflicts("+rntuple ^root@6.34:", when="@:1.1", msg="rntuple API change requires podio@1.2:") - conflicts("^python +freethreading", when="@:1.6", msg="python free-threading requires @1.7:") + conflicts("^python +freethreading", when="@:1.6", msg="python free-threading requires podio@1.7:") # See https://github.com/AIDASoft/podio/pull/600 patch( From 939572b151af657620b10acfefb7b34540091ca5 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 29 Dec 2025 21:41:38 -0600 Subject: [PATCH 4/5] podio: fix style Reformat conflict statement for better readability. --- repos/spack_repo/builtin/packages/podio/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/repos/spack_repo/builtin/packages/podio/package.py b/repos/spack_repo/builtin/packages/podio/package.py index 84d36334b57..dd11b7323ae 100644 --- a/repos/spack_repo/builtin/packages/podio/package.py +++ b/repos/spack_repo/builtin/packages/podio/package.py @@ -91,7 +91,9 @@ class Podio(CMakePackage): conflicts("+rntuple ^root@6.32:", when="@:0.99", msg="rntuple API change requires podio@1:") conflicts("+rntuple ^root@6.34:", when="@:1.1", msg="rntuple API change requires podio@1.2:") - conflicts("^python +freethreading", when="@:1.6", msg="python free-threading requires podio@1.7:") + conflicts( + "^python +freethreading", when="@:1.6", msg="python free-threading requires podio@1.7:" + ) # See https://github.com/AIDASoft/podio/pull/600 patch( From 55c84e990b61a3aeeb15be00be282d7ebe9ba61d Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 30 Dec 2025 20:11:09 -0600 Subject: [PATCH 5/5] dd4hep: conflicts ^python +freethreading --- repos/spack_repo/builtin/packages/dd4hep/package.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/repos/spack_repo/builtin/packages/dd4hep/package.py b/repos/spack_repo/builtin/packages/dd4hep/package.py index b7527f2b77d..d54be5e5cb9 100644 --- a/repos/spack_repo/builtin/packages/dd4hep/package.py +++ b/repos/spack_repo/builtin/packages/dd4hep/package.py @@ -176,6 +176,11 @@ class Dd4hep(CMakePackage): # See https://github.com/AIDASoft/DD4hep/issues/1210 conflicts("^root@6.31.1:", when="@:1.27") + # See https://github.com/AIDASoft/DD4hep/pull/1547 + conflicts( + "^python +freethreading", when="@:1.34", msg="python free-threading requires dd4hep@1.35:" + ) + @property def libs(self): # We need to override libs here, because we don't build a libdd4hep so