Main release/26.04 into main - #21958
Merged
Merged
Conversation
## Description Scanning https://anaconda.org/channels/conda-forge/packages/librdkafka, it appears that 2.11.1 is the first version to support Python 3.14. I think this is the cause of the devcontainer conda failures e.g. https://github.com/rapidsai/cudf/actions/runs/23554430068/job/68577154587?pr=21921 (below). So this PR bumps `librdkafka` and follows our similar, narrow pinning so we support Python 3.14 as well. However, the [python-confluent-kafka recipe](https://github.com/conda-forge/python-confluent-kafka-feedstock/blob/main/recipe/meta.yaml#L38) specifies `- librdkafka >={{ version }}` so we're effectively also pinning `python-confluent-kafka` even though it was unpinned on our side in NVIDIA#21540 ``` The following packages are incompatible ├─ librdkafka >=2.8.0,<2.9.0 * is requested and can be installed; ├─ python-confluent-kafka =* * is installable with the potential options │ ├─ python-confluent-kafka 2.1.0 would require │ │ └─ librdkafka >=2.1.0,<2.2.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.1.1 would require │ │ └─ librdkafka >=2.1.1,<2.2.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.10.0 would require │ │ └─ librdkafka >=2.10.0,<2.11.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.10.1 would require │ │ └─ librdkafka >=2.10.1,<2.11.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.11.0 would require │ │ └─ librdkafka >=2.11.0,<2.12.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.11.1 would require │ │ └─ librdkafka >=2.11.1,<2.12.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.12.2 would require │ │ └─ librdkafka >=2.12.1,<2.13.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.13.0 would require │ │ └─ librdkafka >=2.13.0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.13.2 would require │ │ └─ librdkafka >=2.13.2 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.2.0 would require │ │ └─ librdkafka >=2.2.0,<2.3.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.3.0 would require │ │ └─ librdkafka >=2.3.0,<2.4.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.4.0 would require │ │ └─ librdkafka >=2.4.0,<2.5.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.5.0 would require │ │ └─ librdkafka >=2.5.0,<2.6.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.5.3 would require │ │ └─ librdkafka >=2.5.3,<2.6.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.6.0 would require │ │ └─ librdkafka >=2.6.0,<2.7.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.6.1 would require │ │ └─ librdkafka >=2.6.1,<2.7.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 2.8.0 would require │ │ └─ python_abi =3.10 *_cp310, which can be installed; │ ├─ python-confluent-kafka 2.8.0 would require │ │ └─ python_abi =3.11 *_cp311, which can be installed; │ ├─ python-confluent-kafka 2.8.0 would require │ │ └─ python_abi =3.12 *_cp312, which can be installed; │ ├─ python-confluent-kafka 2.8.0 would require │ │ └─ python_abi =3.13 *_cp313, which can be installed; │ ├─ python-confluent-kafka 2.8.0 would require │ │ └─ python_abi =3.9 *_cp39, which can be installed; │ ├─ python-confluent-kafka [0.11.0|0.11.4|0.9.4] would require │ │ └─ librdkafka [==0.9.4 *|>=0.9.4,<0.9.5.0a0 *], which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 0.11.4 would require │ │ └─ librdkafka >=0.11.0,<0.12 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 0.11.4 would require │ │ └─ librdkafka >=0.11.5,<0.11.6.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 1.0.1 would require │ │ └─ librdkafka >=1.0.1,<1.0.2.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka [1.1.0|1.3.0] would require │ │ └─ python_abi =* *_cp27mu, which can be installed; │ ├─ python-confluent-kafka [1.1.0|1.3.0] would require │ │ └─ python_abi =* *_cp36m, which can be installed; │ ├─ python-confluent-kafka [1.1.0|1.3.0] would require │ │ └─ python_abi =* *_cp37m, which can be installed; │ ├─ python-confluent-kafka [1.1.0|1.3.0] would require │ │ └─ python_abi =* *_cp38, which can be installed; │ ├─ python-confluent-kafka 1.3.0 would require │ │ └─ librdkafka >=1.4.0,<1.5.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka [1.3.0|1.5.0] would require │ │ └─ librdkafka >=1.5.0,<1.6.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka [1.5.0|1.6.0] would require │ │ └─ librdkafka >=1.6.0,<1.7.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 1.7.0 would require │ │ └─ librdkafka >=1.7.0,<1.8.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 1.8.2 would require │ │ └─ librdkafka >=1.8.2.0inf.2,<1.9.0a0 *, which conflicts with any installable versions previously reported; │ ├─ python-confluent-kafka 1.9.0 would require │ │ └─ librdkafka >=1.9.1,<1.10.0a0 *, which conflicts with any installable versions previously reported; │ └─ python-confluent-kafka [1.9.0|1.9.2] would require │ └─ librdkafka >=1.9.2,<1.10.0a0 *, which conflicts with any installable versions previously reported; └─ python =3.14 * is not installable because there are no viable options ├─ python [3.14.0|3.14.1|3.14.2|3.14.3] would require │ └─ python_abi =3.14 *_cp314, which conflicts with any installable versions previously reported; ├─ python [3.14.0|3.14.1|3.14.2|3.14.3] would require │ └─ python_abi =3.14 *_cp314t, which conflicts with any installable versions previously reported; └─ python [3.14.0rc1|3.14.0rc2|3.14.0rc3] would require └─ _python_rc =* *, which does not exist (perhaps a missing channel). ``` ## Checklist - [ ] I am familiar with the [Contributing Guidelines](https://github.com/rapidsai/cudf/blob/HEAD/CONTRIBUTING.md). - [ ] New or existing tests cover these changes. - [ ] The documentation is up to date with these changes. Admin merged per eng request
mroeschke
added
improvement
bdice
approved these changes
Mar 30, 2026
Contributor
Author
|
/merge |
Contributor
|
This PR appears to be a manual resolution for a forward-merge. Such PRs must use a non-squash merge strategy to preserve commit history. Please use the |
Contributor
Author
|
/merge nosquash |
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.
Description
Fixes the merge conflict in #21956
Checklist