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-25.02 into branch-25.04 #743

Merged
merged 2 commits into from
Jan 29, 2025
Merged

Conversation

rapids-bot[bot]
Copy link

@rapids-bot rapids-bot bot commented Jan 27, 2025

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

Proposes adding a small `pre-commit` configuration to the repo, and a new CI job that runs it.

Motivated by noticing an unused import in this Python code:

https://github.com/rapidsai/integration/blob/172ef624ea50670969e1fd79930a46eabdd9c3c9/ci/check_conda_nightly_env.py#L3

I think this will be helpful to catch the types of things that static analyzers are good at catching.

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Gil Forsyth (https://github.com/gforsyth)

URL: #741
@rapids-bot rapids-bot bot requested a review from a team as a code owner January 27, 2025 20:13
@rapids-bot rapids-bot bot requested a review from bdice January 27, 2025 20:13
Copy link
Author

rapids-bot bot commented Jan 27, 2025

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.

@jameslamb
Copy link
Member

Unable to forward-merge due to an error, manual merge is necessary

I'll handle this, after we merge #742

@jameslamb jameslamb requested review from jameslamb and removed request for bdice January 27, 2025 20:14
@jameslamb jameslamb self-assigned this Jan 27, 2025
Contributes to rapidsai/build-planning#142

Proposes removing the exclusion for `ucx-proc` in the CI job that checks that all projects have produced recent-enough nightlies. See that linked issue for much more detail, but in short:

* there haven't been new `ucx-proc` packages for 2+ years, since conda-forge/ucx-split-feedstock#111
* RAPIDS can safely drop its `ucx-proc` dependency, and other PRs linked to rapidsai/build-planning#142 have done that for the 25.02 release
* `ucx-proc` should not show up in RAPIDS 25.02 environment solves, and so we don't need to carry an exclusion for it in the testing config

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - https://github.com/jakirkham
  - Bradley Dice (https://github.com/bdice)

URL: #742
@AyodeAwe AyodeAwe merged commit 699e6e5 into branch-25.04 Jan 29, 2025
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants