🔧 Merge defaults into config earlier #1341
Merged
+28
−21
Conversation
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
Since sphinx-doc/sphinx#12949 it has become more apparent that sphinx detects some configuration values as changed when they have not. This fixes most of these by merging user defined config with built-in defaults earlier in the processing. The only thing is does not fix is config altered by adding services. This is difficult, since services are stored on the `env`, which is not initialised until agter the config is checked.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1341 +/- ##
==========================================
+ Coverage 86.87% 87.96% +1.08%
==========================================
Files 56 60 +4
Lines 6532 7103 +571
==========================================
+ Hits 5675 6248 +573
+ Misses 857 855 -2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
danwos
approved these changes
Oct 28, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Since sphinx-doc/sphinx#12949 it has become more apparent that sphinx detects some sphinx-needs configuration values as changed when they have not. This fixes most of these by merging user defined config with built-in defaults earlier in the processing.
The only thing it does not fix is config altered by adding services.
This is difficult, since services are stored on the
env, which is not initialised until after the config is checked.