From f48d69f9c6e38d5f9ad1a3bc2a6f3235863081e2 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Mon, 30 Sep 2024 20:49:38 +0000 Subject: [PATCH] chore: spack: cherry-pick: update py-pyspark and py-py4j (py-protobuf only) --- spack.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spack.sh b/spack.sh index 0f9d61c9c..cdf588adf 100644 --- a/spack.sh +++ b/spack.sh @@ -28,6 +28,7 @@ d3bf1e04fca844abb7c1eeac38dda4e126c81b67 737b70cbbfacb3fba8054426e9b5bf8ede6d8faf a66586d749197841bd74e289802126f2359287a8 7503a417731910d918a7863d1862f62c9b76429d +67536058077995cab1ed23b8ca62aaf75463ae04 7b9f8abce5cee74546a6f588f88c6f353170d52b 096ab11961995ac8d69f7b177cbcadf618d3068e 6c4abef75cb2b98c337f8a3179797e29dfdc9ca3 @@ -35,6 +36,7 @@ a66586d749197841bd74e289802126f2359287a8 ## Optional hash table with comma-separated file list read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ --- || true +[67536058077995cab1ed23b8ca62aaf75463ae04]=var/spack/repos/builtin/packages/py-protobuf/package.py [7b9f8abce5cee74546a6f588f88c6f353170d52b]=var/spack/repos/builtin/packages/protobuf/package.py,var/spack/repos/builtin/packages/py-protobuf/package.py --- ## Ref: https://github.com/spack/spack/commit/[hash] @@ -59,6 +61,7 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ ## 737b70cbbfacb3fba8054426e9b5bf8ede6d8faf: Buildcache: remove deprecated --allow-root and preview subcommand ## a66586d749197841bd74e289802126f2359287a8: spack buildcache push: best effort ## 7503a417731910d918a7863d1862f62c9b76429d: cuda: add v12.4.1 +## 67536058077995cab1ed23b8ca62aaf75463ae04: Update py-pyspark and py-py4j (py-protobuf only) ## 7b9f8abce5cee74546a6f588f88c6f353170d52b: Add depends_on([c,cxx,fortran]) ## 096ab11961995ac8d69f7b177cbcadf618d3068e: py-onnx: link to external protobuf ## 6c4abef75cb2b98c337f8a3179797e29dfdc9ca3: py-protobuf: drop +cpp, always require protobuf -- GitLab