Forward-merge branch-24.12 into branch-25.02 #571
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…apids-dask-dependency` (rapidsai#513) Explicitly include dependencies on `libcufile*` and `*cudart*` in the Python Conda package. These seem to be pulled in implicitly by the C++ package. However as they are dependencies of the Python built shared objects, they should also be listed here. Also consolidate the Conda environment creation and installation of nightly dependencies into one step. By doing this in one step, we guarantee that all of our constraints are taken into account during environment creation. Lastly switch from using `dask` directly to `rapids-dask-dependency` to align Dask installation and pinning with the rest of RAPIDS. xref: rapidsai/build-planning#22 xef: rapidsai#378 Authors: - https://github.com/jakirkham - Mads R. B. Kristensen (https://github.com/madsbk) Approvers: - Bradley Dice (https://github.com/bdice) - Mads R. B. Kristensen (https://github.com/madsbk) URL: rapidsai#513
jakirkham
commented
Dec 6, 2024
| @@ -12,7 +12,7 @@ jobs: | |||
| trigger-notifier: | |||
| if: contains(github.event.pull_request.labels.*.name, 'breaking') | |||
| secrets: inherit | |||
| uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@branch-24.12 | |||
| uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@branch-25.02 | |||
There was a problem hiding this comment.
As part of fixing conflicts, needed to rerun the update version script. It looks like this line wasn't updated previously. So it got picked up now. Just flagging this for awareness
Note this GHA workflow came from PR: #536
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolve conflicts in the bot forward merger PR: #570