Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the commit that actually landed in upstream spack #673

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use the commit that actually landed in upstream spack #673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cherry-pick
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/46465.diff

# py-onnx: add a patch for the standard, remove after 1.15.0
git add .
git cherry-pick 248a7c0f4894222bfcd0bb76b13a984c92d4c938 -X theirs --no-commit
git cherry-pick bbd205543b09139f2f57f21099eb366c9f183d76 -X theirs --no-commit

# py-cython: add version 3.0.11, remove when https://github.com/spack/spack/pull/46772 is merged
git cherry-pick 072d308c0b4b53c0d0528ee3a7e59de110133968 -X theirs --no-commit
Expand Down
Loading