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.10 into branch-24.12 #6079

Merged
merged 3 commits into from
Sep 25, 2024
Merged

Conversation

rapids-bot[bot]
Copy link

@rapids-bot rapids-bot bot commented Sep 24, 2024

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

… libcuml conda host dependencies (#6071)

Contributes to rapidsai/build-planning#56

* updates `fmt` and `spdlog` to newer versions, to match the rest of RAPIDS
* adds `fmt` and `spdlog` to `host:` dependencies for `libcuml` conda packages (see #6071 (comment))

Now that most of `conda-forge` has been updated to `fmt >=11.0.1,<12` and `spdlog>=1.14.1,<1.15` (rapidsai/build-planning#56 (comment)), we're attempting to upgrade RAPIDS to similar versions of those libraries.

This improves the likelihood that RAPIDS will be installable alongside newer versions of its
dependencies and complementary packages on conda-forge.

## Notes for Reviewers

This PR is testing changes made in rapidsai/rapids-cmake#689.

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

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

URL: #6071
@rapids-bot rapids-bot bot requested a review from a team as a code owner September 24, 2024 03:45
@rapids-bot rapids-bot bot requested a review from msarahan September 24, 2024 03:45
@github-actions github-actions bot added the conda conda issue label Sep 24, 2024
Copy link
Author

rapids-bot bot commented Sep 24, 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.

This PR updates the update-version.sh script to use the packaging
library, given that setuptools is no longer included by default in
Python 3.12.
@AyodeAwe AyodeAwe requested a review from a team as a code owner September 24, 2024 19:14
@github-actions github-actions bot added the ci label Sep 24, 2024
fixes #6036

Authors:
  - Severin Dicks (https://github.com/Intron7)
  - Divye Gala (https://github.com/divyegala)
  - Dante Gama Dessavre (https://github.com/dantegd)

Approvers:
  - Victor Lafargue (https://github.com/viclafargue)

URL: #6042
@AyodeAwe AyodeAwe merged commit 746d3ff into branch-24.12 Sep 25, 2024
102 of 104 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci conda conda issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants