From eab1d6df80fd7b16908760e31ed4c2096df2d912 Mon Sep 17 00:00:00 2001 From: Vanessasaurus <814322+vsoch@users.noreply.github.com> Date: Thu, 17 Apr 2025 02:00:27 -0600 Subject: [PATCH] flux-core: add v0.68.0 -> v0.73.0 (#49893) * Automated deployment to update package flux-core 2025-04-04 * Add py-packaging * Do not pin py-packaging * flux-sched: build older flux-core flux sched 0.38 was the first that required gcc version 12 or higher, and flux-core continued to build for some time, but eventually added features that we are now seeing break with sched 0.37 and the latest flux. This conflicts should ensure that older flux-sched, which is being built by having an older compiler, only builds with flux-core up to 0.68. Signed-off-by: vsoch --------- Signed-off-by: vsoch Co-authored-by: github-actions Co-authored-by: vsoch --- var/spack/repos/builtin/packages/flux-core/package.py | 9 +++++++++ var/spack/repos/builtin/packages/flux-sched/package.py | 1 + 2 files changed, 10 insertions(+) diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py index e5d733c4bf4..c96d323131e 100644 --- a/var/spack/repos/builtin/packages/flux-core/package.py +++ b/var/spack/repos/builtin/packages/flux-core/package.py @@ -20,6 +20,12 @@ class FluxCore(AutotoolsPackage): license("LGPL-3.0-only") version("master", branch="master") + version("0.73.0", sha256="d029c3da68bd0a0bea40d964de772e90a55eec72303b610396882f9e94d8c0c6") + version("0.72.0", sha256="1642d9f93cca6e0e934b534609787a31753462215ab376d190cdced16c386524") + version("0.71.0", sha256="023fd3e2153e20ba28cdf60fefa14d60053df61de3b9e273bf6f9a9ebdef0b52") + version("0.70.0", sha256="f68fbc2038d7c0d54c71260b4a8253a73cf6abc09a663ab060a00a4181a9fa94") + version("0.69.0", sha256="c44fe9c41e54c2a7dcde24c660c07c8b422072540add0447cbba867719e167b5") + version("0.68.0", sha256="fd3d0b0b13136f3914733c7f9e775372a8808d3c7c724ba076fda277a5abeae3") version("0.67.0", sha256="9406e776cbeff971881143fd1b94c42ec912e5b226401d2d3d91d766dd81de8c") version("0.66.0", sha256="0a25cfb1ebc033c249614eb2350c6fb57b00cdf3c584d0759c787f595c360daa") version("0.65.0", sha256="a60bc7ed13b8e6d09e99176123a474aad2d9792fff6eb6fd4da2a00e1d2865ab") @@ -98,6 +104,9 @@ class FluxCore(AutotoolsPackage): 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("py-setuptools", type="build", when="@0.67.0:") + # distutils was dropped in Python 3.12, this fallback was added 9/19/2023 + # for version 0.54.0 but we don't need it until setuptools is dropped + depends_on("py-packaging", type=("build", "run")) depends_on("jansson@2.10:") depends_on("pkgconfig") depends_on("lz4") diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py index 4dbab624bfb..fd3e8ce6a59 100644 --- a/var/spack/repos/builtin/packages/flux-sched/package.py +++ b/var/spack/repos/builtin/packages/flux-sched/package.py @@ -81,6 +81,7 @@ class FluxSched(CMakePackage, AutotoolsPackage): conflicts("%gcc@:9.3", when="@0.34:") conflicts("%gcc@:11", when="@0.37:", msg="gcc version must be 12 or higher") conflicts("%clang@:14", when="@0.37:", msg="clang must be version 15 or higher") + conflicts("flux-core@0.68:", when="@:0.38", msg="sched before 0.38 requires older core") depends_on("py-sphinx@1.6.3:", when="+docs", type="build") depends_on("flux-core", type=("build", "link", "run"))