Skip to content
Snippets Groups Projects
Commit f48d69f9 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

chore: spack: cherry-pick: update py-pyspark and py-py4j (py-protobuf only)

parent 83e28d30
No related branches found
No related tags found
No related merge requests found
Pipeline #103682 canceled
Stage: status-pending
Stage: config
Stage: base
Stage: eic
Stage: benchmarks
Stage: finalize
Stage: status-report
This commit is part of merge request !1009. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 0 deletions
spack.sh
+ 3
− 0
View file @ f48d69f9
...@@ -28,6 +28,7 @@ d3bf1e04fca844abb7c1eeac38dda4e126c81b67 ...@@ -28,6 +28,7 @@ d3bf1e04fca844abb7c1eeac38dda4e126c81b67
737b70cbbfacb3fba8054426e9b5bf8ede6d8faf 737b70cbbfacb3fba8054426e9b5bf8ede6d8faf
a66586d749197841bd74e289802126f2359287a8 a66586d749197841bd74e289802126f2359287a8
7503a417731910d918a7863d1862f62c9b76429d 7503a417731910d918a7863d1862f62c9b76429d
67536058077995cab1ed23b8ca62aaf75463ae04
7b9f8abce5cee74546a6f588f88c6f353170d52b 7b9f8abce5cee74546a6f588f88c6f353170d52b
096ab11961995ac8d69f7b177cbcadf618d3068e 096ab11961995ac8d69f7b177cbcadf618d3068e
6c4abef75cb2b98c337f8a3179797e29dfdc9ca3 6c4abef75cb2b98c337f8a3179797e29dfdc9ca3
...@@ -35,6 +36,7 @@ a66586d749197841bd74e289802126f2359287a8 ...@@ -35,6 +36,7 @@ a66586d749197841bd74e289802126f2359287a8
## Optional hash table with comma-separated file list ## Optional hash table with comma-separated file list
read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
--- || true --- || 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 [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] ## Ref: https://github.com/spack/spack/commit/[hash]
...@@ -59,6 +61,7 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ ...@@ -59,6 +61,7 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
## 737b70cbbfacb3fba8054426e9b5bf8ede6d8faf: Buildcache: remove deprecated --allow-root and preview subcommand ## 737b70cbbfacb3fba8054426e9b5bf8ede6d8faf: Buildcache: remove deprecated --allow-root and preview subcommand
## a66586d749197841bd74e289802126f2359287a8: spack buildcache push: best effort ## a66586d749197841bd74e289802126f2359287a8: spack buildcache push: best effort
## 7503a417731910d918a7863d1862f62c9b76429d: cuda: add v12.4.1 ## 7503a417731910d918a7863d1862f62c9b76429d: cuda: add v12.4.1
## 67536058077995cab1ed23b8ca62aaf75463ae04: Update py-pyspark and py-py4j (py-protobuf only)
## 7b9f8abce5cee74546a6f588f88c6f353170d52b: Add depends_on([c,cxx,fortran]) ## 7b9f8abce5cee74546a6f588f88c6f353170d52b: Add depends_on([c,cxx,fortran])
## 096ab11961995ac8d69f7b177cbcadf618d3068e: py-onnx: link to external protobuf ## 096ab11961995ac8d69f7b177cbcadf618d3068e: py-onnx: link to external protobuf
## 6c4abef75cb2b98c337f8a3179797e29dfdc9ca3: py-protobuf: drop +cpp, always require protobuf ## 6c4abef75cb2b98c337f8a3179797e29dfdc9ca3: py-protobuf: drop +cpp, always require protobuf
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment