Skip to content

merge release/26.06 into main - #8184

Merged
jameslamb merged 2 commits into
NVIDIA:mainfrom
jameslamb:main-merge-release/26.06
May 29, 2026
Merged

jameslamb merged 2 commits into
NVIDIA:mainfrom
jameslamb:main-merge-release/26.06

Conversation

@jameslamb

Copy link
Copy Markdown
Member

closes #8182

fixes forward-merger conflicts

jameslamb and others added 2 commits May 29, 2026 10:04
Contributes to rapidsai/build-planning#284

To reduce the risk of users encountering a known runtime issue with
`cupy` and `torch`, RAPIDS 26.06 is taking on a requirement
`cupy!=14.1.0`.
See the linked issue for details.
@jameslamb
jameslamb requested review from a team as code owners May 29, 2026 20:14
@jameslamb
jameslamb requested a review from msarahan May 29, 2026 20:14
@github-actions github-actions Bot added conda conda issue Cython / Python Cython or Python issue ci labels May 29, 2026
@jameslamb

Copy link
Copy Markdown
Member Author

These conflict resolutions are small and non-controversial, admin no-squash merging this to save CI resources and prevent conflicts from piling up.

@jameslamb jameslamb added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels May 29, 2026
@jameslamb
jameslamb merged commit 4d01e52 into NVIDIA:main May 29, 2026
33 of 43 checks passed
@jameslamb
jameslamb deleted the main-merge-release/26.06 branch May 29, 2026 20:15
@coderabbitai

coderabbitai Bot commented May 29, 2026

Copy link
Copy Markdown

Review Change Stack

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 0ea35dd0-3d75-4bf3-bdee-cb69ffbc98e3

📥 Commits

Reviewing files that changed from the base of the PR and between a1dd376 and 6ae4285.

📒 Files selected for processing (8)
  • ci/test_wheel_integrations.sh
  • conda/environments/all_cuda-129_arch-aarch64.yaml
  • conda/environments/all_cuda-129_arch-x86_64.yaml
  • conda/environments/all_cuda-132_arch-aarch64.yaml
  • conda/environments/all_cuda-132_arch-x86_64.yaml
  • conda/recipes/cuml/recipe.yaml
  • dependencies.yaml
  • python/cuml/pyproject.toml

📝 Walkthrough

Summary by CodeRabbit

  • Chores
    • Updated dependency constraints to exclude incompatible package versions (14.0.0 and 14.1.0) across multiple CUDA environments and configuration files.
    • Simplified the BERTopic integration test script for improved maintainability.

Walkthrough

This PR removes the pytest dependency from the BERTopic wheel integration test and adds version exclusions for CuPy 14.0.0 and 14.1.0 across all conda environment specs, recipe files, and Python dependency declarations to address compatibility issues.

Changes

BERTopic test and CuPy version constraints

Layer / File(s) Summary
BERTopic test integration update
ci/test_wheel_integrations.sh
Removes the explicit pytest installation alongside bertopic in the wheel integration test script, relying on bertopic's own dependencies instead.
CuPy version constraints across dependency specs
conda/environments/all_cuda-129_arch-aarch64.yaml, conda/environments/all_cuda-129_arch-x86_64.yaml, conda/environments/all_cuda-132_arch-aarch64.yaml, conda/environments/all_cuda-132_arch-x86_64.yaml, conda/recipes/cuml/recipe.yaml, dependencies.yaml, python/cuml/pyproject.toml
Adds explicit exclusions for CuPy versions 14.0.0 and 14.1.0 across all conda environment YAML files, the cuML conda recipe, the dependency matrix, and the Python project dependencies while preserving the minimum version constraint of ≥13.6.0.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Possibly related PRs

  • rapidsai/cuml#8179: Both PRs make the same targeted updates to the BERTopic wheel integration test and add CuPy version exclusions across shared dependency specs.
  • rapidsai/cuml#7907: Modifies ci/test_wheel_integrations.sh's BERTopic wheel installation command with --prefer-binary flag.
  • rapidsai/cuml#8167: Previously added pytest alongside bertopic to fix the integration test, now being reversed by this PR's removal of pytest.

Suggested labels

conda, Cython / Python, improvement, non-breaking, ci

Suggested reviewers

  • msarahan
  • csadorf
  • bdice
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci conda conda issue Cython / Python Cython or Python 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