From b23038db53c19e0a2cd6b06b16ed05662ebb684f Mon Sep 17 00:00:00 2001 From: Mark Grondona Date: Mon, 12 Feb 2024 09:55:00 +0000 Subject: [PATCH] flux-core: drop czmq,jsonschema requirements for recent versions (#42560) Problem: Older versions of the flux-core package require czmq and jsonschema, but these dependencies have been dropped in recent versions. Add `when=` arguments to drop these requirements for the appropriate versions of flux-core. --- var/spack/repos/builtin/packages/flux-core/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py index 23942004444..8b6a3e8a3f1 100644 --- a/var/spack/repos/builtin/packages/flux-core/package.py +++ b/var/spack/repos/builtin/packages/flux-core/package.py @@ -135,7 +135,7 @@ class FluxCore(AutotoolsPackage): depends_on("libarchive+iconv", when="@0.38.0:") depends_on("ncurses@6.2:", when="@0.32.0:") depends_on("libzmq@4.0.4:") - depends_on("czmq@3.0.1:") + depends_on("czmq@3.0.1:", when="@:0.54.0") depends_on("hwloc@1.11.1:1", when="@:0.17.0") depends_on("hwloc@1.11.1:", when="@0.17.0:") depends_on("hwloc +cuda", when="+cuda") @@ -153,7 +153,7 @@ class FluxCore(AutotoolsPackage): depends_on("py-cffi@1.1:", type=("build", "run")) depends_on("py-six@1.9:", when="@:0.24", type=("build", "run")) depends_on("py-pyyaml@3.10:", type=("build", "run")) - depends_on("py-jsonschema@2.3:", type=("build", "run")) + depends_on("py-jsonschema@2.3:", type=("build", "run"), when="@:0.58.0") depends_on("py-ply", type=("build", "run"), when="@0.46.1:") depends_on("jansson") depends_on("jansson@2.10:", when="@0.21.0:")