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

Merge branch 24.10 into branch 24.12 #6083

Merged
merged 4 commits into from
Sep 25, 2024

Conversation

jameslamb
Copy link
Member

Closes #6079

Fixes forward-merger conflicts, per the process described at https://docs.rapids.ai/maintainers/forward-merger

jameslamb and others added 4 commits September 24, 2024 03:45
… libcuml conda host dependencies (rapidsai#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 rapidsai#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: rapidsai#6071
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.
@jameslamb jameslamb added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Sep 25, 2024
@jameslamb jameslamb requested review from a team as code owners September 25, 2024 14:42
@jameslamb jameslamb requested a review from bdice September 25, 2024 14:42
Copy link

copy-pr-bot bot commented Sep 25, 2024

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

@github-actions github-actions bot added conda conda issue ci labels Sep 25, 2024
@AyodeAwe AyodeAwe merged commit 117baba into rapidsai:branch-24.12 Sep 25, 2024
4 checks passed
@jameslamb jameslamb deleted the branch-24.12-merge-24.10 branch September 25, 2024 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci conda conda issue improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants