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.

Sign up for GitHub

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

Jump to bottom

Merge branch-24.10 into branch-24.12 #1463

Merged
merged 3 commits into from
Sep 25, 2024
Merged

Merge branch-24.10 into branch-24.12 #1463

merged 3 commits into from
Sep 25, 2024

Conversation

jameslamb
Copy link
Member

Description

Replaces #1461

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

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.

seberg and others added 3 commits September 24, 2024 01:03
@seberg
Remove NumPy <2 pin, remove proj pin (rapidsai#1441)
be73c8e 
This PR removes the NumPy<2 pin which is expected to work for
RAPIDS projects once CuPy 13.3.0 is released (CuPy 13.2.0 had
some issues preventing the use with NumPy 2).

Also contributes to rapidsai/build-planning#56 by removing the pin on `proj` (which allows this project to work with newer `fmt` / `spdlog`, in sync with conda-forge).

Authors:
  - Sebastian Berg (https://github.com/seberg)
  - Bradley Dice (https://github.com/bdice)
  - James Lamb (https://github.com/jameslamb)
  - https://github.com/jakirkham

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

URL: rapidsai#1441
@AyodeAwe
update update-version.sh to use packaging lib (rapidsai#1462)
3d94bec
@jameslamb
Merge branch-24.10 into branch-24.12
a9ad86e
@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:46
@github-actions github-actions bot added conda Related to conda and conda configuration Python Related to Python code ci labels Sep 25, 2024
@AyodeAwe AyodeAwe merged commit 2f4a108 into rapidsai:branch-24.12 Sep 25, 2024
31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@raydouglass raydouglass Awaiting requested review from raydouglass raydouglass is a code owner automatically assigned from rapidsai/packaging-codeowners

Assignees
No one assigned
Labels
ci conda Related to conda and conda configuration improvement Improvement / enhancement to an existing function non-breaking Non-breaking change Python Related to Python code
Projects
cuSpatial
Status: Todo
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jameslamb @AyodeAwe @seberg