Forward-merge branch-25.02 into branch-25.04 #1531
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
Fixes undesired CI skips in rapidsai#1523. Authors: - Bradley Dice (https://github.com/bdice) - Matthew Roeschke (https://github.com/mroeschke) Approvers: - James Lamb (https://github.com/jameslamb) - Vyas Ramasubramani (https://github.com/vyasr) - Jake Awe (https://github.com/AyodeAwe) URL: rapidsai#1527
…#1523) Follow up to rapidsai#1514 Addressing the review in rapidsai#1514 (comment) by ensuring the Cython bindings return pylibcudf objects where possible instead of python objects (like cudf Python columns) so we can also have better return annotations for these methods where appropriate. Subsequently, the conversion from pylibcudf to cudf Python has been moved to the cuspatial Python layer. Additionally, this PR will be necessary for rapidsai/cudf#17760 not to break cuspatial Authors: - Matthew Roeschke (https://github.com/mroeschke) - Michael Wang (https://github.com/isVoid) - Bradley Dice (https://github.com/bdice) Approvers: - Michael Wang (https://github.com/isVoid) - Bradley Dice (https://github.com/bdice) URL: rapidsai#1523
bdice
approved these changes
Feb 4, 2025
bdice
added
improvement
|
/merge |
|
Aghhhhh I forgot. I can't fix the forward merge this way. We have to get a non-squash admin-merge. 😭 I'm sorry, I will work on a proper fix and request the non-squash admin-merge. |
|
I opened #1532 and requested a non-squash admin-merge from the ops team. |
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.
Description
Addressing merge conflict in #1530
Checklist