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.

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

Forward-merge branch-24.04 into branch-24.06 #15625

Closed
wants to merge 1 commit into from

Conversation

rapids-bot[bot]
Copy link

@rapids-bot rapids-bot bot commented May 1, 2024

Forward-merge triggered by push to branch-24.04 that creates a PR to keep branch-24.06 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge. See forward-merger docs for more info.

Backport of #15506 to cuDF 24.04.

Also backports #15574 to ignore a warning from newer cupy releases.

---------

Co-authored-by: Vyas Ramasubramani <[email protected]>
@rapids-bot rapids-bot bot requested review from a team as code owners May 1, 2024 12:27
@rapids-bot rapids-bot bot requested review from mroeschke and brandon-b-miller May 1, 2024 12:27
Copy link
Author

rapids-bot bot commented May 1, 2024

FAILURE - Unable to forward-merge due to an error, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/forward-merger/

IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the /merge comment). Instead, an admin must manually merge by changing the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

@github-actions github-actions bot added Python Affects Python cuDF API. conda labels May 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Python Affects Python cuDF API.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant