Skip to content

Forward-merge release/26.04 into main - #7937

Merged
jameslamb merged 2 commits into
NVIDIA:mainfrom
jameslamb:main-merge-release/26.04
Mar 31, 2026
Merged

Forward-merge release/26.04 into main#7937
jameslamb merged 2 commits into
NVIDIA:mainfrom
jameslamb:main-merge-release/26.04

Conversation

@jameslamb

@jameslamb jameslamb commented Mar 31, 2026

Copy link
Copy Markdown
Member

Replaces #7923

Fixes forward-merger conflicts.

jcrist and others added 2 commits March 31, 2026 17:08
The scipy docs site has some reliability issues, and can sometimes cause our docs to fail to build. While they're resolving this, we'll disable scipy intersphinx mappings. We rarely make use of scipy intersphinx mappings anyway, so this won't be a huge docs UX degradation.

Authors:
  - Jim Crist-Harif (https://github.com/jcrist)

Approvers:
  - Dante Gama Dessavre (https://github.com/dantegd)

URL: NVIDIA#7935
@jameslamb
jameslamb requested a review from a team as a code owner March 31, 2026 19:45
@jameslamb
jameslamb requested a review from betatim March 31, 2026 19:45
@jameslamb jameslamb added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Mar 31, 2026
@coderabbitai

coderabbitai Bot commented Mar 31, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

The Sphinx documentation configuration was updated to remove the scipy intersphinx mapping entry from docs/source/conf.py, replacing the active mapping with TODO comments while preserving all other documentation linking configurations.

Changes

Cohort / File(s) Summary
Documentation Configuration
docs/source/conf.py
Removed active "scipy" entry from intersphinx_mapping and replaced it with commented-out TODO lines; all other intersphinx mappings remain unchanged.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

Possibly related PRs

Suggested reviewers

  • dantegd
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The pull request title accurately describes the main objective: forward-merging release/26.04 into main, which matches the changeset purpose.
Linked Issues check ✅ Passed The PR successfully addresses issue #7923 by forward-merging release/26.04 into main and resolving merge conflicts, meeting the stated objective.
Out of Scope Changes check ✅ Passed The change to disable SciPy intersphinx mappings in docs/source/conf.py is a legitimate conflict resolution from the release branch merge, not out-of-scope.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Description check ✅ Passed The pull request description directly addresses the changeset by explaining it resolves forward-merger conflicts and replaces a previous PR.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

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

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

@jameslamb

Copy link
Copy Markdown
Member Author

/merge nosquash

@rapids-bot

rapids-bot Bot commented Mar 31, 2026

Copy link
Copy Markdown
Contributor

Commit history integrity check failed: not all commits from original PR #7923 appear to be present individually in this PR's history. This usually happens if commits were squashed during the manual resolution process. Please ensure all original commits are preserved individually. You can fix this and try the /merge nosquash command again.

4 similar comments
@rapids-bot

rapids-bot Bot commented Mar 31, 2026

Copy link
Copy Markdown
Contributor

Commit history integrity check failed: not all commits from original PR #7923 appear to be present individually in this PR's history. This usually happens if commits were squashed during the manual resolution process. Please ensure all original commits are preserved individually. You can fix this and try the /merge nosquash command again.

@rapids-bot

rapids-bot Bot commented Mar 31, 2026

Copy link
Copy Markdown
Contributor

Commit history integrity check failed: not all commits from original PR #7923 appear to be present individually in this PR's history. This usually happens if commits were squashed during the manual resolution process. Please ensure all original commits are preserved individually. You can fix this and try the /merge nosquash command again.

@rapids-bot

rapids-bot Bot commented Mar 31, 2026

Copy link
Copy Markdown
Contributor

Commit history integrity check failed: not all commits from original PR #7923 appear to be present individually in this PR's history. This usually happens if commits were squashed during the manual resolution process. Please ensure all original commits are preserved individually. You can fix this and try the /merge nosquash command again.

@rapids-bot

rapids-bot Bot commented Mar 31, 2026

Copy link
Copy Markdown
Contributor

Commit history integrity check failed: not all commits from original PR #7923 appear to be present individually in this PR's history. This usually happens if commits were squashed during the manual resolution process. Please ensure all original commits are preserved individually. You can fix this and try the /merge nosquash command again.

@jameslamb

Copy link
Copy Markdown
Member Author

Yeah yeah ok ok. I'll do it manually.

@jameslamb
jameslamb merged commit b44cbbd into NVIDIA:main Mar 31, 2026
63 checks passed
@jameslamb
jameslamb deleted the main-merge-release/26.04 branch March 31, 2026 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

4 participants