diff --git a/docs/spack-environment.md b/docs/spack-environment.md index c2113478..47e5ac3c 100644 --- a/docs/spack-environment.md +++ b/docs/spack-environment.md @@ -151,7 +151,7 @@ is shown here. Refer to `spack.sh` and `spack-packages.sh` for the current lists ```bash # From spack.sh (illustrative — see spack.sh for actual commits) -SPACK_VERSION="v1.1.0" +SPACK_VERSION="v1.1.1" SPACK_CHERRYPICKS=$(cat <<- EOF 09f75ee426a2e05e0543570821582480ff823ba5 a462612b64e97fa7dfe461c32c58553fd6ec63c5 diff --git a/spack-packages.sh b/spack-packages.sh index e924fbc9..50cfd91a 100644 --- a/spack-packages.sh +++ b/spack-packages.sh @@ -51,6 +51,7 @@ cfa8d650480c409de2d568cf1355bf7e509f4c1c b2f469de6a7c823bf93b9fa408b0ef4b67442f5f 3368f8849e57da0ad1eaa0086b1855538e5db03e 5ec7462a628681522f8cf6016a9aa72fbd40dd91 +5e1d32f27d8c8a684bfef2b5301c4eaf525d06c2 --- ## Optional hash table with comma-separated file list ## For these commits, the cherry-pick will be restricted to the listed files only. @@ -100,3 +101,4 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \ ## b2f469de6a7c823bf93b9fa408b0ef4b67442f5f: py-snakemake-storage-plugin-rucio: add v0.4.1 ## 3368f8849e57da0ad1eaa0086b1855538e5db03e: just: add 1.46.0 ## 5ec7462a628681522f8cf6016a9aa72fbd40dd91: arrow: add 20.0.0, 21.0.0, 22.0.0 +## 5e1d32f27d8c8a684bfef2b5301c4eaf525d06c2: py-tensorflow: env.set(..., str) diff --git a/spack.sh b/spack.sh index faf0603f..0db5a26a 100644 --- a/spack.sh +++ b/spack.sh @@ -5,7 +5,7 @@ SPACK_ORGREPO="spack/spack" ## Spack github version, e.g. v0.18.1 or commit hash ## note: nightly builds will use e.g. releases/v1.0 -SPACK_VERSION="v1.1.0" +SPACK_VERSION="v1.1.1" ## Space-separated list of spack cherry-picks read -r -d '' SPACK_CHERRYPICKS <<- \