From fcc6edb294a0360b448273183d7d49c62fdd554f Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 14 Nov 2025 18:46:27 -0600 Subject: [PATCH 1/4] Upgrade Spack Packages to v2025.11.0 --- spack-packages.sh | 58 +---------------------------------------------- 1 file changed, 1 insertion(+), 57 deletions(-) diff --git a/spack-packages.sh b/spack-packages.sh index c304adae..62765f0c 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -3,40 +3,13 @@ SPACKPACKAGES_ORGREPO="spack/spack-packages" ## Spack github version, e.g. v2025.07.0 or commit hash ## note: nightly builds will use e.g. develop -SPACKPACKAGES_VERSION="v2025.07.0" +SPACKPACKAGES_VERSION="v2025.11.0" ## Space-separated list of spack-packages cherry-picks read -r -d '' SPACKPACKAGES_CHERRYPICKS <<- \ --- || true -b5ffbcc4aa43bffbffa96ff9a436a68773e10933 -b6b6d79c25c1496472f9535ec33c9030b27353ab -405e97751385dccbd6ec6e6f3b57dc28fc04c76b -ba00d764b91db70bce8236bc528a1d4af37c4ce9 -4b243eb07a483a6bf527c2f74e5766b35afa528b -948d4ea14409e38d47882b5a5c2d61d99d02b30b -215e9f93f4de43095bd12e39809b9afeb89655f0 -8aaec9b76104af2cf58e7be55485d6c2385b41ab -8751ca4c4ba54559b40cdaa3c319bf14db72e28e -2c1e68ded81add6d3d0fbc005ad19b0727639204 -a118c877bcca1d71810528ba481b8d3f819035f1 -0c164b846058d9c57c9adb6b17ef86ead9f4b8c4 -b440c61b9cddfab0fd59dd5fc607c95247a18bc9 -698ce0531e4be2d55ca667d6f9341636397c2662 -387d9a5213cc6e3fd738b995b25d6facde4cc902 -1d53be2a26ecb7809c1f6006ed8cbfe7febee7a9 a115a811bdfce4db5298a9ba9b7903ccfb0de101 22dadd619053ff0872903549db616200bda082f0 -7fad8a78d35b5556e1d7aa92a71a4e1c58a1665a -1b976bbdf7c5bce37d6541beb93445791f9292c6 -20aa538bd0d33743b8cd9dd9179c759b85615d47 -795ad32793a7dfda1086f31b7e49cf4ae52672f6 -e61079273e806301d76cc64f53fb034980988583 -b063312bb52fb62010e04588f6b16d37e16c8d02 -b7870dfad11c4e8ca9690b0895c98f16d79f5398 -1e8f896b2807bcc48553e90d6212f0931fa5262f -e998e20d3979c5aa47faaf59a8020e3fab13ab97 -904792d49dc4236c5394dbc0aebbe45175b59187 -a3f3a80e2877645c72cca0381c820307fe1d4523 559789f67245a40306aeea636b61348e97d4f092 95c45b6c3322e151fd29ed00ea10567b97705ee4 d6f99b8d611cf740eb45e13df2c84044a4ca6ae4 @@ -48,40 +21,11 @@ c4d983b764d7b1ee2b63da79f5f25365ac61ce7a ## Optional hash table with comma-separated file list read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ --- || true -[b063312bb52fb62010e04588f6b16d37e16c8d02]=repos/spack_repo/builtin/packages/py_tensorflow/package.py -[7fad8a78d35b5556e1d7aa92a71a4e1c58a1665a]=repos/spack_repo/builtin/packages/py_tensorflow/package.py,repos/spack_repo/builtin/packages/py_tensorboard/package.py --- ## Ref: https://github.com/spack/spack-packages/commit/[hash] ## [hash]: [description] -## b5ffbcc4aa43bffbffa96ff9a436a68773e10933: strace: add v6.15 -## b6b6d79c25c1496472f9535ec33c9030b27353ab: iwyu: add patch for 0.23 -## 405e97751385dccbd6ec6e6f3b57dc28fc04c76b: iwyu,g2,r-curl: requires(pkg) -> requires(^pkg) -## ba00d764b91db70bce8236bc528a1d4af37c4ce9: py-gfal2-python: depends_on c -## 4b243eb07a483a6bf527c2f74e5766b35afa528b: gobject-introspection: restore setuptools@44: support -## 948d4ea14409e38d47882b5a5c2d61d99d02b30b: scikit-hep packages: update to latest major.minor versions -## 215e9f93f4de43095bd12e39809b9afeb89655f0: py-boost-histogram: depends_on py-setuptools-scm type build -## 8aaec9b76104af2cf58e7be55485d6c2385b41ab: py-uproot: depends_on py-numpy@:1 when @:5.3.2 -## 8751ca4c4ba54559b40cdaa3c319bf14db72e28e: py-hist: add v2.6.2 thru v2.8.0 (switch to hatchling) -## 2c1e68ded81add6d3d0fbc005ad19b0727639204: pythia8: add v8.314 and v8.315 -## a118c877bcca1d71810528ba481b8d3f819035f1: py-hist: fix py-boost-histogram dependency -## 0c164b846058d9c57c9adb6b17ef86ead9f4b8c4: g4vg: new version 1.0.5 -## b440c61b9cddfab0fd59dd5fc607c95247a18bc9: force CMAKE_INSTALL_RPATH to prefix/lib/root for ROOT -## 698ce0531e4be2d55ca667d6f9341636397c2662: root: add v6.36.02 -## 387d9a5213cc6e3fd738b995b25d6facde4cc902: acts: only init submodules when +odd -## 1d53be2a26ecb7809c1f6006ed8cbfe7febee7a9: root: add v6.36.04 ## a115a811bdfce4db5298a9ba9b7903ccfb0de101: github-copilot: new package ## 22dadd619053ff0872903549db616200bda082f0: claude-code: new package -## 1b976bbdf7c5bce37d6541beb93445791f9292c6: py-keras: add v3.11.0 -## 20aa538bd0d33743b8cd9dd9179c759b85615d47: py-keras: add v3.11.1 -## 795ad32793a7dfda1086f31b7e49cf4ae52672f6: py-keras: add v3.11.2 -## e61079273e806301d76cc64f53fb034980988583: py-keras: add v3.11.3 -## b7870dfad11c4e8ca9690b0895c98f16d79f5398: py-keras: add v3.12.0 -## b063312bb52fb62010e04588f6b16d37e16c8d02: Remove Python-related deprecations -## 7fad8a78d35b5556e1d7aa92a71a4e1c58a1665a: py-tensorflow: add v2.19, v2.20 -## 1e8f896b2807bcc48553e90d6212f0931fa5262f: simsipm: Add conflict for aarch64 -## e998e20d3979c5aa47faaf59a8020e3fab13ab97: py-immutables: add v0.21 -## 904792d49dc4236c5394dbc0aebbe45175b59187: py-yapf: add versions -## a3f3a80e2877645c72cca0381c820307fe1d4523: py-numba: fix python dependency bounds ## 559789f67245a40306aeea636b61348e97d4f092: estarlight: add thru v1.2.0 ## 95c45b6c3322e151fd29ed00ea10567b97705ee4: py-tensorflow: modify cuDNN dependency versions when +cuda ## d6f99b8d611cf740eb45e13df2c84044a4ca6ae4: py-tensorflow: patch to build with +cuda From 988a595c41d3b3818f25326cc8973dfcf2839077 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sat, 15 Nov 2025 21:02:34 -0600 Subject: [PATCH 2/4] fix: yoda: require: @2.1.0: --- spack-environment/packages.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index d893d0aa..bcb563ae 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -542,6 +542,9 @@ packages: require: - '@5.7.0:' - cxxstd=20 -davix +python +scitokens-cpp + yoda: + require: + - '@2.1.0:' zlib-api: require: - zlib-ng From cbd408d0ad21ad9bc23a7e3e0f9e9e1591022f1f Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 20 Nov 2025 16:25:17 -0600 Subject: [PATCH 3/4] Remove Julia version upgrade spack cherry-picks --- spack-packages.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spack-packages.sh b/spack-packages.sh index 62765f0c..05944405 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -14,8 +14,6 @@ a115a811bdfce4db5298a9ba9b7903ccfb0de101 95c45b6c3322e151fd29ed00ea10567b97705ee4 d6f99b8d611cf740eb45e13df2c84044a4ca6ae4 bc25e5eb2f8f7a8733cdc10d92e9787358c82cfa -c4d983b764d7b1ee2b63da79f5f25365ac61ce7a -44da889cc86bb8a5315c729a7c79f2c002c9c951 5c37f836753e8f9683fdc547f3661c5045abcbd1 --- ## Optional hash table with comma-separated file list @@ -30,6 +28,4 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 95c45b6c3322e151fd29ed00ea10567b97705ee4: py-tensorflow: modify cuDNN dependency versions when +cuda ## d6f99b8d611cf740eb45e13df2c84044a4ca6ae4: py-tensorflow: patch to build with +cuda ## bc25e5eb2f8f7a8733cdc10d92e9787358c82cfa: actsvg: patch version numbers into source source -## c4d983b764d7b1ee2b63da79f5f25365ac61ce7a: Julia: add v1.11.6 -## 44da889cc86bb8a5315c729a7c79f2c002c9c951: Julia: add v1.11.7 ## 5c37f836753e8f9683fdc547f3661c5045abcbd1: root: require openblas ~ilp64 symbol_suffix=none when ^openblas From 528df5f5814ca66c1e0e4cbd29c95c253f5d0dee Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 20 Nov 2025 18:36:39 -0600 Subject: [PATCH 4/4] fix: rm spack cherry-pick: actsvg: patch version numbers into source source --- spack-packages.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/spack-packages.sh b/spack-packages.sh index 05944405..76df396b 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -13,7 +13,6 @@ a115a811bdfce4db5298a9ba9b7903ccfb0de101 559789f67245a40306aeea636b61348e97d4f092 95c45b6c3322e151fd29ed00ea10567b97705ee4 d6f99b8d611cf740eb45e13df2c84044a4ca6ae4 -bc25e5eb2f8f7a8733cdc10d92e9787358c82cfa 5c37f836753e8f9683fdc547f3661c5045abcbd1 --- ## Optional hash table with comma-separated file list @@ -27,5 +26,4 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## 559789f67245a40306aeea636b61348e97d4f092: estarlight: add thru v1.2.0 ## 95c45b6c3322e151fd29ed00ea10567b97705ee4: py-tensorflow: modify cuDNN dependency versions when +cuda ## d6f99b8d611cf740eb45e13df2c84044a4ca6ae4: py-tensorflow: patch to build with +cuda -## bc25e5eb2f8f7a8733cdc10d92e9787358c82cfa: actsvg: patch version numbers into source source ## 5c37f836753e8f9683fdc547f3661c5045abcbd1: root: require openblas ~ilp64 symbol_suffix=none when ^openblas