Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Emit "source-read" events for files read via the include directive #11510

Merged
merged 29 commits into from
Aug 14, 2023
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2497401
Add test that exposes issue 10678
halldorfannar Jul 24, 2023
1e0c93c
Subclass docutils RSTParser to fix issue
halldorfannar Jul 24, 2023
b61e2bf
Improve test
halldorfannar Jul 24, 2023
552ecd5
Improve test and fix issues uncovered.
halldorfannar Jul 24, 2023
2fad0bc
Add CHANGES entry
halldorfannar Jul 24, 2023
1ab3d66
Address feedback from GitHub CI
halldorfannar Jul 24, 2023
78c1e3f
More clean-up to appease the style gods
halldorfannar Jul 24, 2023
a084948
Trailing whitespaces removed
halldorfannar Jul 24, 2023
4c727ce
Fix unit tests
halldorfannar Jul 25, 2023
1759ebd
Fix formatting in CHANGE entry
halldorfannar Jul 25, 2023
68ca10b
Improve comment
halldorfannar Jul 25, 2023
db5eef4
Use :dudir: to refer to include directive
halldorfannar Jul 25, 2023
a76918f
Revert "Fix unit tests"
halldorfannar Jul 25, 2023
9cd7205
Change approach
halldorfannar Jul 25, 2023
8d2f487
Fix test failure on Windows
halldorfannar Jul 25, 2023
e953025
Merge branch 'issue-10678' of https://github.com/halldorfannar/sphinx…
halldorfannar Jul 25, 2023
9712e58
Add type: ignore to work around known issue
halldorfannar Jul 31, 2023
876e039
Address flake8 issue
halldorfannar Jul 31, 2023
4e7749b
Merge branch '7.1.x' into issue-10678
halldorfannar Jul 31, 2023
3f165cd
Adjust CHANGES
halldorfannar Jul 31, 2023
db8c4e9
Add space to silence flake8
halldorfannar Jul 31, 2023
4e66777
Merge branch '7.1.x' into issue-10678
halldorfannar Aug 2, 2023
3682fb1
Merge branch 'master' into issue-10678
AA-Turner Aug 3, 2023
62584d9
Merge branch 'master' into issue-10678
AA-Turner Aug 5, 2023
c87cf13
Update sphinx/directives/other.py
halldorfannar Aug 7, 2023
fa70d06
Merge branch 'master' into issue-10678
AA-Turner Aug 11, 2023
1dba6ff
Formatting
AA-Turner Aug 11, 2023
16afce6
Merge branch 'master' into issue-10678
AA-Turner Aug 14, 2023
9550b09
Only patch if there are source-read listeners
AA-Turner Aug 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "Fix unit tests"
This reverts commit 4c727ce.
halldorfannar committed Jul 25, 2023
commit a76918feaa5cdec4d39e981f7ab6ef9b25a5dd75
4 changes: 2 additions & 2 deletions tests/test_ext_inheritance_diagram.py
Original file line number Diff line number Diff line change
@@ -210,7 +210,7 @@ def test_inheritance_diagram_latex_alias(app, status, warning):


def test_import_classes(rootdir):
from sphinx.parsers import Parser, RSTParser, RSTStateMachine
from sphinx.parsers import Parser, RSTParser
from sphinx.util.i18n import CatalogInfo

try:
@@ -241,7 +241,7 @@ def test_import_classes(rootdir):

# all of classes in the module
classes = import_classes('sphinx.parsers', None)
assert set(classes) == {Parser, RSTParser, RSTStateMachine}
assert set(classes) == {Parser, RSTParser}

# specified class in the module
classes = import_classes('sphinx.parsers.Parser', None)
2 changes: 1 addition & 1 deletion tests/test_parser.py
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@


@pytest.mark.sphinx(testroot='basic')
@patch('sphinx.parsers.RSTStateMachine')
@patch('docutils.parsers.rst.states.RSTStateMachine')
def test_RSTParser_prolog_epilog(RSTStateMachine, app):
document = new_document('dummy.rst')
document.settings = Mock(tab_width=8, language_code='')