From 1edc89a256070ea72200b1c1c703ada576f97b73 Mon Sep 17 00:00:00 2001 From: Chris Green Date: Tue, 7 Nov 2023 14:46:56 -0600 Subject: [PATCH 1/3] Style --- packages/cetlib/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cetlib/package.py b/packages/cetlib/package.py index cb55634a..a2417178 100644 --- a/packages/cetlib/package.py +++ b/packages/cetlib/package.py @@ -48,7 +48,7 @@ class Cetlib(CMakePackage): depends_on("catch2@3:", when="@3.17:", type=("build", "test")) depends_on("catch2@2.3.0:", when="@:3.16.99", type=("build", "test")) depends_on("catch2", type=("build", "test")) - depends_on('cetmodules', type='build') + depends_on("cetmodules", type="build") conflicts("cetmodules@:3.21.00", when="catch2@3:") if "SPACK_CMAKE_GENERATOR" in os.environ: From 27961cc2f3bb2f8603d6463776e728c2266e177e Mon Sep 17 00:00:00 2001 From: Chris Green Date: Tue, 7 Nov 2023 14:47:30 -0600 Subject: [PATCH 2/3] Dependence on `hep-concurrency` is now build-only (for tests) --- packages/cetlib/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/cetlib/package.py b/packages/cetlib/package.py index a2417178..051cff31 100644 --- a/packages/cetlib/package.py +++ b/packages/cetlib/package.py @@ -40,7 +40,8 @@ class Cetlib(CMakePackage): depends_on("boost+regex+program_options+filesystem+system+test") depends_on("cetlib-except") - depends_on("hep-concurrency") + depends_on("hep-concurrency", when="@3.19:", type=("build", "test")) + depends_on("hep-concurrency", when="@:3.18.99") depends_on("openssl") depends_on("perl", type=("build", "run")) depends_on("sqlite@3.8.2:") From e6734a3cf5e745224c9bd87379570ba1481dfd78 Mon Sep 17 00:00:00 2001 From: Chris Green Date: Tue, 7 Nov 2023 15:07:21 -0600 Subject: [PATCH 3/3] `tbb` dependence is indirect (h/t @knokepfel) --- packages/cetlib/package.py | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/cetlib/package.py b/packages/cetlib/package.py index 051cff31..e7575bb0 100644 --- a/packages/cetlib/package.py +++ b/packages/cetlib/package.py @@ -45,7 +45,6 @@ class Cetlib(CMakePackage): depends_on("openssl") depends_on("perl", type=("build", "run")) depends_on("sqlite@3.8.2:") - depends_on("tbb") depends_on("catch2@3:", when="@3.17:", type=("build", "test")) depends_on("catch2@2.3.0:", when="@:3.16.99", type=("build", "test")) depends_on("catch2", type=("build", "test"))