Forward-merge release/26.04 into main#866
Merged
jameslamb merged 2 commits intorapidsai:mainfrom Mar 19, 2026
Merged
Conversation
Contributes to rapidsai/build-planning#205 This PR adds support for Python 3.14. ## Notes for Reviewers This is part of ongoing work to add Python 3.14 support across RAPIDS. It temporarily introduces a build/test matrix including Python 3.14, from rapidsai/shared-workflows#508. A follow-up PR will revert back to pointing at the `main` branch of `shared-workflows` once all RAPIDS repos have added Python 3.14 support. ### This will fail until all dependencies have been updated to Python 3.14 CI here is expected to fail until all of this project's upstream dependencies support Python 3.14. This can be merged whenever all CI jobs are passing. Authors: - Gil Forsyth (https://github.com/gforsyth) - https://github.com/apps/renovate Approvers: - James Lamb (https://github.com/jameslamb) - Bradley Dice (https://github.com/bdice) URL: rapidsai#864
Member
Author
|
The build failures here are the same solver issues we have on And the only conflicts here were in documentation, because we had I'm admin-merging this to get |
jameslamb
added a commit
that referenced
this pull request
Mar 31, 2026
Nightly builds on `main` are failing like this: ```text 56.98 Could not solve for environment specs 56.98 The following packages are incompatible 56.98 ├─ rapids-dask-dependency =26.6,>=0.0.0a0 * is requested and can be installed; 56.98 └─ rapids =26.4 * is not installable because it requires 56.98 └─ custreamz =26.4 *, which requires 56.98 └─ rapids-dask-dependency =26.4 *, which conflicts with any installable versions previously reported. ``` ([build link](https://github.com/rapidsai/docker/actions/runs/23732578503/job/69129525562#step:10:731)) They should be looking for 26.06 packages, and I'd expect them to because the `v26.06.00a` tag is closer to HEAD of `main` than `v26.04.00a`. <img width="1814" height="933" alt="image" src="https://github.com/user-attachments/assets/be141f18-b937-4997-9b91-5fb0489cef51" /> I think the root cause is that I made some mistake in creating the branch for #866 (still not sure exactly what) that ended up making `v26.04.00a` satisfy this: https://github.com/rapidsai/docker/blob/2637556074567056aa69a7cb1850ac844ef89748/.github/workflows/build-cuvs-image.yml#L63 This proposes permanently avoiding by using `git describe --first-parent` From https://git-scm.com/docs/git-describe > _Follow only the first parent commit upon seeing a merge commit. This is useful when you wish to not match tags on branches merged in the history of the target commit._ ## Notes for Reviewers ### How I tested this ```console $ git checkout main $ git pull upstream main $ git fetch upstream --tags $ git describe --tags --abbrev=0 v26.04.00a $ git describe --tags --first-parent --abbrev=0 v26.06.00a ```
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replaces #865
Fixes forward-merger conflicts
Notes for Reviewers
This should be no-squash merged.