Forward-merge branch-24.12 into branch-25.02

[rapids-bot]

Forward-merge triggered by push to branch-24.12 that creates a PR to keep branch-25.02 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.

[rapids-bot]

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.

[rjzamora]

I don't think we need to carry this change forward to 25.02 unless we can't get dask/distributed#8962 merged in distributed soon. Does that sound right @jakirkham ?

[jakirkham]

Correct and the Distributed PR has already been merged

So would suggest we simply close this PR out

[bdice]

We need to merge this to retain a clean history across branches. We can revert the change in this PR and then admin non-squash merge it.

[bdice]

Reverting changes as discussed in the PR conversation.

edit: I lack permissions to do this. I will file a separate PR to fix this forward-merge.

[bdice]

#76 will resolve this.

[jakirkham]

We need to merge this to retain a clean history across branches. We can revert the change in this PR and then admin non-squash merge it.

Had thought about this initially as well

Though in looking through the org saw a number of PRs that simply get closed

So thought it would be safe to close

That said, no strong feelings on either approach

[bdice]

Most of the closed PRs are replaced by manual forward merges. For example, rapidsai/cudf#17508 was closed because its changes are in rapidsai/cudf#17511.

If we are closing forward merges without a manual forward merge, I think that is a process problem? @raydouglass can confirm.

[AyodeAwe]

I think this PR was closed automatically due to the Closes #75 text included in the PR description of #76.

[bdice]

Yes, that was intentional — the manual forward merge replaced this PR. This is now solved.

[vyasr]

FWIW manual forward merges will automatically close the corresponding original forward merge PR even without the keyword. These PRs get closed when all of the commits get added to the target branch by the other PR. No harm in having the keyword close too though.

[AyodeAwe]

FWIW manual forward merges will automatically close the corresponding original forward merge PR even without the keyword. These PRs get closed when all of the commits get added to the target branch by the other PR. No harm in having the keyword close too though.

Yep you're right. I think though that without the Closes keyword the original PR shows as "Merged" (with the purple icon) rather than "Closed" (with the red icon). I.E:

instead of

[jakirkham]

The commit history is still included just the same