From 04f0af0a28e1f6ff0ef0b50e28ecf9d19fe544e6 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 31 Jul 2024 13:51:38 -0500 Subject: [PATCH] acts,dd4hep: restrict to podio@0 to prevent failures with podio@1 (#44825) * dd4hep: restrict to podio@0 to prevent failures with podio@1 * acts: restrict to podio@0 to prevent failures with podio@1 * dd4hep: close when range for podio * acts: close when range for podio * acts: fix when range for podio * acts: close when range for podio * acts,dd4hep: ensure main/master still depends on podio --- var/spack/repos/builtin/packages/acts/package.py | 2 ++ var/spack/repos/builtin/packages/dd4hep/package.py | 1 + 2 files changed, 3 insertions(+) diff --git a/var/spack/repos/builtin/packages/acts/package.py b/var/spack/repos/builtin/packages/acts/package.py index 735b4b8736f..d4f79be031c 100644 --- a/var/spack/repos/builtin/packages/acts/package.py +++ b/var/spack/repos/builtin/packages/acts/package.py @@ -353,7 +353,9 @@ class Acts(CMakePackage, CudaPackage): depends_on("nlohmann-json @3.9.1:", when="@0.14: +json") depends_on("podio @0.6:", when="@25: +edm4hep") depends_on("podio @0.16:", when="@30.3: +edm4hep") + depends_on("podio @:0", when="@:35 +edm4hep") depends_on("podio @0.16:", when="+podio") + depends_on("podio @:0", when="@:35 +podio") depends_on("pythia8", when="+pythia8") depends_on("python", when="+python") depends_on("python@3.8:", when="+python @19.11:19") diff --git a/var/spack/repos/builtin/packages/dd4hep/package.py b/var/spack/repos/builtin/packages/dd4hep/package.py index c6c45d9cfc8..e7deeba0d95 100644 --- a/var/spack/repos/builtin/packages/dd4hep/package.py +++ b/var/spack/repos/builtin/packages/dd4hep/package.py @@ -123,6 +123,7 @@ class Dd4hep(CMakePackage): depends_on("podio@:0.16.03", when="@:1.23 +edm4hep") depends_on("podio@0.16:", when="@1.24: +edm4hep") depends_on("podio@0.16.3:", when="@1.26: +edm4hep") + depends_on("podio@:0", when="@:1.29 +edm4hep") depends_on("py-pytest", type=("build", "test")) # See https://github.com/AIDASoft/DD4hep/pull/771 and https://github.com/AIDASoft/DD4hep/pull/876