Don't remove substitution_reference nodes (fix #7953) #8183
Conversation
This file contains 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
SubstitutionDefinitionsRemover is now a SphinxPostTransform, only applied in the Sphinx builder, as was originally the case (see sphinx-doc#4827).
brechtm
force-pushed
the
pr/keep_substitution_definition_nodes
branch
from
636682f
to
c9d8eac
Compare
Some of the tests that have rst_epilog or rst_prolog set need to be adjusted to not fail when encountering substitution definitions which have reappeared since fixing sphinx-doc#7953.
tk0miya
reviewed
Oct 5, 2020
| @@ -21,7 +21,8 @@ def test_code_directive(app): | |||
| ' print("hello world")\n') | |||
|
|
|||
| doctree = restructuredtext.parse(app, text) | |||
| assert_node(doctree, [nodes.document, nodes.literal_block, 'print("hello world")']) | |||
| assert_node(doctree, ([nodes.literal_block, 'print("hello world")'], | |||
| nodes.substitution_definition)) | |||
There was a problem hiding this comment.
Finally, I found the reason why the substituion_definition node appears suddenly here. tests/roots/test-root/conf.py contains a substitution definition in its rst_epilog. We need to remove it to be these testcases healthy. I'll work on it.
There was a problem hiding this comment.
I just posted #8295 to fix it. So please update this PR. Then I'll review this again.
|
I merged this partially (without unnecessary changes of testings) at #8354. |
tk0miya
added a commit
that referenced
this pull request
Nov 1, 2020
|
Thanks, @tk0miya. I didn't find the time yet to get back to this, so you beat me to it. Cheers! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
SubstitutionDefinitionsRemover is now a SphinxPostTransform, only
applied in the Sphinx builder, as was originally the case (see #4827).