Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,15 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.11", "3.12", "3.13", "3.14"]
sphinx: [">=8,<9"]
sphinx: [">=8,<9", ">=9,<10"]
os: [ubuntu-latest]
include:
# - os: ubuntu-latest
# python-version: "3.11"
# sphinx: ">=7,<8"
- os: windows-latest
python-version: "3.11"
sphinx: ">=8,<9"
- os: windows-latest
python-version: "3.14"
sphinx: ">=8,<9"
sphinx: ">=9,<10"

runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies = [
"markdown-it-py~=4.0",
"mdit-py-plugins~=0.5",
"pyyaml",
"sphinx>=8,<9",
"sphinx>=8,<10",
]

[project.urls]
Expand Down
4 changes: 2 additions & 2 deletions tests/test_renderers/fixtures/sphinx_directives.md
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ term 2 : B
Definition of both terms.
.

SPHINX4-SKIP productionlist (`sphinx.domains.std.ProductionList`):
SKIP productionlist (`sphinx.domains.std.ProductionList`):
.
```{productionlist} try_stmt: try1_stmt | try2_stmt
```
Expand Down Expand Up @@ -426,7 +426,7 @@ rst:directive (`sphinx.domains.rst.ReSTDirective`):
<desc_content>
.

SPHINX4-SKIP rst:directive:option (`sphinx.domains.rst.ReSTDirectiveOption`):
SKIP rst:directive:option (`sphinx.domains.rst.ReSTDirectiveOption`):
.
```{rst:directive:option} a
```
Expand Down
6 changes: 3 additions & 3 deletions tests/test_renderers/fixtures/sphinx_syntax_elements.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ Image empty:
.
<document source="<src>/index.md">
<paragraph>
<image alt="" uri="">
<image alt="" candidates="{'*': '.'}" original_uri="" uri=".">
.

Image with alt and title:
Expand All @@ -178,7 +178,7 @@ Image with alt and title:
.
<document source="<src>/index.md">
<paragraph>
<image alt="alt" title="title" uri="src">
<image alt="alt" candidates="{'*': 'src'}" title="title" uri="src">
.

Image with escapable html:
Expand All @@ -187,7 +187,7 @@ Image with escapable html:
.
<document source="<src>/index.md">
<paragraph>
<image alt="alt" uri="http://www.google%3C%3E.com">
<image alt="alt" candidates="{'?': 'http://www.google%3C%3E.com'}" uri="http://www.google%3C%3E.com">
.

Block Quote:
Expand Down
18 changes: 11 additions & 7 deletions tests/test_renderers/test_fixtures_sphinx.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,16 @@ def _apply_transforms(self):

result = sphinx_doctree(file_params.content, "index.md")
pformat = result.pformat("index")
# changed in docutils 0.20.1
pformat = pformat.replace(
'<literal classes="code" language="">', '<literal classes="code">'
)
replacements = {
# changed in docutils 0.20.1
'<literal classes="code" language="">': '<literal classes="code">',
# changed in sphinx 9
'<image alt="" uri="">': '<image alt="" candidates="{\'*\': \'.\'}" original_uri="" uri=".">',
'<image alt="alt" title="title" uri="src">': '<image alt="alt" candidates="{\'*\': \'src\'}" title="title" uri="src">',
'<image alt="alt" uri="http://www.google%3C%3E.com">': '<image alt="alt" candidates="{\'?\': \'http://www.google%3C%3E.com\'}" uri="http://www.google%3C%3E.com">',
}
for old, new in replacements.items():
pformat = pformat.replace(old, new)
file_params.assert_expected(pformat, rstrip_lines=True)


Expand Down Expand Up @@ -89,9 +95,7 @@ def test_sphinx_directives(
):
# TODO fix skipped directives
# TODO test domain directives
if file_params.title.startswith("SKIP") or file_params.title.startswith(
"SPHINX4-SKIP"
):
if file_params.title.startswith("SKIP"):
pytest.skip(file_params.title)

sphinx_doctree_no_tr.set_conf({"extensions": ["myst_parser"]})
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
# then then deleting compiled files has been found to fix it: `find . -name \*.pyc -delete`

[tox]
envlist = py311-sphinx8
envlist = py311-sphinx9

[testenv]
usedevelop = true

[testenv:py{311,312,313,314}-sphinx{8}]
[testenv:py{311,312,313,314}-sphinx{8,9}]
deps =
sphinx8: sphinx>=8,<9
extras =
Expand Down
Loading