Forward-merge release/26.04 into main - #7937
Conversation
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
📝 WalkthroughWalkthroughThe Sphinx documentation configuration was updated to remove the scipy intersphinx mapping entry from Changes
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~2 minutes Possibly related PRs
Suggested reviewers
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
/merge nosquash |
|
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 |
4 similar comments
|
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 |
|
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 |
|
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 |
|
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 |
|
Yeah yeah ok ok. I'll do it manually. |
Replaces #7923
Fixes forward-merger conflicts.