From: Dmitry Shachnev Date: Sat, 27 Sep 2025 00:42:25 +0300 Subject: Update the test expectations for Docutils 0.22 Forwarded: https://github.com/wasi-master/rich-rst/pull/17 --- tests/test_main.py | 17 ++++++++++++++++- tests/test_vectors/directives_expected.html | 16 ++++++++-------- tests/test_vectors/specification_expected.html | 19 +++++++++++++------ 3 files changed, 37 insertions(+), 15 deletions(-) diff --git a/tests/test_main.py b/tests/test_main.py index 3347d86..397212c 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -1,3 +1,4 @@ +import docutils import pytest from rich_rst import RestructuredText from pathlib import Path @@ -6,6 +7,10 @@ from rich.terminal_theme import TerminalTheme test_vectors_path = Path("tests/test_vectors") rst_paths = sorted(str(x) for x in test_vectors_path.glob("*.rst")) +docutils_0_22_mark = pytest.mark.skipif( + docutils.__version_info__ < (0, 22), + reason="requires docutils 0.22 or higher", +) def render_to_html(rst): @@ -38,7 +43,17 @@ def render_to_html(rst): return console.export_html(theme=DRACULA_TERMINAL_THEME) -@pytest.mark.parametrize("rst_path", rst_paths) +@pytest.mark.parametrize( + "rst_path", + [ + ( + pytest.param(path, marks=docutils_0_22_mark) + if path.endswith(("directives.rst", "specification.rst")) + else path + ) + for path in rst_paths + ], +) def test_main(rst_path): rst_path = Path(rst_path) actual_html_path = rst_path.parent / (rst_path.stem + "_actual.html") diff --git a/tests/test_vectors/directives_expected.html b/tests/test_vectors/directives_expected.html index 416e5e1..7b00afd 100644 --- a/tests/test_vectors/directives_expected.html +++ b/tests/test_vectors/directives_expected.html @@ -1714,28 +1714,28 @@ references to the element using text as reference name. Specifying the name opt bild.png :name: my picture is a concise syntax alternative to preceding it with a hyperlink target .. _my picture: .. image:: bild.png ╭───────────────────────────────── System Message: INFO/1 (<rst-document>, line 982); ─────────────────────────────────╮ -│ <rst-document>:982: (INFO/1) Duplicate implicit target name: "contents". │ +│ <rst-document>:982: (INFO/1) Target name overrides implicit target name "contents". │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────── System Message: INFO/1 (<rst-document>, line 1965); ─────────────────────────────────╮ -│ <rst-document>:1965: (INFO/1) Duplicate implicit target name: "class". │ +│ <rst-document>:1965: (INFO/1) Target name overrides implicit target name "class". │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────── System Message: INFO/1 (<rst-document>, line 2006); ─────────────────────────────────╮ -│ <rst-document>:2006: (INFO/1) Duplicate implicit target name: "figure". │ +│ <rst-document>:2006: (INFO/1) Target name overrides implicit target name "figure". │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────── System Message: INFO/1 (<rst-document>, line 2010); ─────────────────────────────────╮ -│ <rst-document>:2010: (INFO/1) Duplicate implicit target name: "image". │ +│ <rst-document>:2010: (INFO/1) Target name overrides implicit target name "image". │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────── System Message: INFO/1 (<rst-document>, line 2022); ─────────────────────────────────╮ -│ <rst-document>:2022: (INFO/1) Duplicate implicit target name: "rubric". │ +│ <rst-document>:2022: (INFO/1) Target name overrides implicit target name "rubric". │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────── System Message: INFO/1 (<rst-document>, line 2023); ─────────────────────────────────╮ -│ <rst-document>:2023: (INFO/1) Duplicate implicit target name: "sidebar". │ +│ <rst-document>:2023: (INFO/1) Target name overrides implicit target name "sidebar". │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────── System Message: INFO/1 (<rst-document>, line 2024); ─────────────────────────────────╮ -│ <rst-document>:2024: (INFO/1) Duplicate implicit target name: "table". │ +│ <rst-document>:2024: (INFO/1) Target name overrides implicit target name "table". │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────── System Message: INFO/1 (<rst-document>, line 2027); ─────────────────────────────────╮ -│ <rst-document>:2027: (INFO/1) Duplicate implicit target name: "topic". │ +│ <rst-document>:2027: (INFO/1) Target name overrides implicit target name "topic". │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ┌─────────────────────────────────────────────────────── Footer ───────────────────────────────────────────────────────┐ │ "Metadata" is data about data, in this case data about the │ diff --git a/tests/test_vectors/specification_expected.html b/tests/test_vectors/specification_expected.html index 11fe696..cd443a2 100644 --- a/tests/test_vectors/specification_expected.html +++ b/tests/test_vectors/specification_expected.html @@ -2172,20 +2172,27 @@ someone@somewhere.com Doctree elements: system_message, problematic. Markup errors are handled according to the specification in PEP 258. -╭────────────────────────────────── System Message: INFO/1 (<rst-document>, line 5); ──────────────────────────────────╮ -│ <rst-document>:5: (INFO/1) Enumerated list start value not ordinal-1: "6" (ordinal 6) │ +╭───────────────────────────────── System Message: INFO/1 (<rst-document>, line 457); ─────────────────────────────────╮ +│ <rst-document>:457: (INFO/1) Duplicate implicit target name: "document". │ +╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ +╭──────────────────────────────── System Message: INFO/1 (<rst-document>, line 2525); ─────────────────────────────────╮ +│ <rst-document>:2525: (INFO/1) Enumerated list start value not ordinal-1: "6" (ordinal 6) │ +╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ +╭──────────────────────────────── System Message: INFO/1 (<rst-document>, line 2925); ─────────────────────────────────╮ +│ <rst-document>:2925: (INFO/1) Duplicate name "footnote_references" for external target "footnote_references │ +│ setting". │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────── System Message: INFO/1 (<rst-document>, line 3197); ─────────────────────────────────╮ -│ <rst-document>:3197: (INFO/1) Duplicate explicit target name: "topic". │ +│ <rst-document>:3197: (INFO/1) Duplicate name "topic" for external target "../doctree.html#topic". │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────── System Message: INFO/1 (<rst-document>, line 3208); ─────────────────────────────────╮ -│ <rst-document>:3208: (INFO/1) Duplicate explicit target name: "list_item". │ +│ <rst-document>:3208: (INFO/1) Duplicate name "list_item" for external target "../doctree.html#list-item". │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────── System Message: INFO/1 (<rst-document>, line 3254); ─────────────────────────────────╮ -│ <rst-document>:3254: (INFO/1) Duplicate explicit target name: "reference". │ +│ <rst-document>:3254: (INFO/1) Duplicate name "reference" for external target "../doctree.html#reference". │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ╭──────────────────────────────── System Message: INFO/1 (<rst-document>, line 3255); ─────────────────────────────────╮ -│ <rst-document>:3255: (INFO/1) Duplicate explicit target name: "reference". │ +│ <rst-document>:3255: (INFO/1) Duplicate name "reference" for external target "../doctree.html#reference". │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ┌─────────────────────────────────────────────────────── Footer ───────────────────────────────────────────────────────┐ │ In LaTeX, the default definition is 1Â px = 1/72Â in (cf. How to │