FIX: account for unreleased changes to sphinx#649
Merged
larsoner merged 4 commits intonumpy:mainfrom Oct 10, 2025
Merged
Conversation
Reported upstream at: sphinx-doc/sphinx#13942 The type of `options` has changed to a custom type so the merging logic no longer works as expected. This is probably the wrong long term fix, but gets Matplotlib's docs building again.
larsoner
reviewed
Oct 10, 2025
Collaborator
|
Let's get this in to keep things working, thanks @tacaswell ! |
larsoner
approved these changes
Oct 10, 2025
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
3 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.
Reported upstream at: sphinx-doc/sphinx#13942
The type of
optionshas changed to a custom type so the merging logic nolonger works as expected.
This is probably the wrong long term fix, but gets Matplotlib's docs building
again.