diff --git a/requirements.txt b/requirements.txt index fe4459e..b7370de 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ default-values>=0.5.0 dict2css>=0.2.3 -docutils==0.16 +docutils>=0.16 domdf-python-tools>=2.9.0 -sphinx<3.6.0,>=3.2.0 +sphinx<5,>=3.2.0 sphinx-panels>=0.5.1 sphinx-toolbox>=2.13.0 diff --git a/tests/conftest.py b/tests/conftest.py index c03a83e..431d5ce 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -6,4 +6,4 @@ import types types.Union = types.UnionType -pytest_plugins = ("coincidence", ) +pytest_plugins = ("coincidence", "sphinx_toolbox.testing") diff --git a/tests/test_output/test_output.py b/tests/test_output/test_output.py index 292979b..5051768 100644 --- a/tests/test_output/test_output.py +++ b/tests/test_output/test_output.py @@ -8,7 +8,7 @@ from coincidence.regressions import AdvancedFileRegressionFixture from domdf_python_tools.paths import PathPlus from domdf_python_tools.stringlist import StringList -from sphinx_toolbox.testing import check_html_regression +from sphinx_toolbox.testing import HTMLRegressionFixture, LaTeXRegressionFixture, check_html_regression def test_build_example(app): @@ -18,12 +18,15 @@ def test_build_example(app): @pytest.mark.sphinx("html", srcdir="test-root") @pytest.mark.parametrize("page", ["index.html"], indirect=True) -def test_html_output(page: BeautifulSoup, advanced_file_regression: AdvancedFileRegressionFixture): - check_html_regression(page, advanced_file_regression) +def test_html_output(page: BeautifulSoup, html_regression: HTMLRegressionFixture): + html_regression.check(page, jinja2=True) @pytest.mark.sphinx("latex", srcdir="test-root") -def test_latex_output(app, advanced_file_regression: AdvancedFileRegressionFixture): +def test_latex_output( + app, + latex_regression: LaTeXRegressionFixture, + ): random.seed("5678") assert app.builder.name.lower() == "latex" @@ -31,7 +34,8 @@ def test_latex_output(app, advanced_file_regression: AdvancedFileRegressionFixtu output_file = PathPlus(app.outdir / "sphinx-highlights-demo.tex") content = str(StringList(output_file.read_lines())).replace("\\sphinxAtStartPar\n", '') - advanced_file_regression.check( - re.sub(r"\\date{.*}", r"\\date{Mar 11, 2021}", content), - extension=".tex", + latex_regression.check( + # re.sub(r"\\date{.*}", r"\\date{Mar 11, 2021}", content), + content, + jinja2=True, ) diff --git a/tests/test_output/test_output_/test_html_output_index_html_.html b/tests/test_output/test_output_/test_html_output_index_html_.html index 088edc0..d1651ac 100644 --- a/tests/test_output/test_output_/test_html_output_index_html_.html +++ b/tests/test_output/test_output_/test_html_output_index_html_.html @@ -1,9 +1,14 @@ +{% set section = ("section", "section") if docutils_version >= (0, 17) else ('div class="section"', "div") -%} - + {% if docutils_version[1] == 18 %}<meta content="Docutils 0.18.1: http://docutils.sourceforge.net/" name="generator"/> + {% elif docutils_version[1] == 17 %}<meta content="Docutils 0.17.1: http://docutils.sourceforge.net/" name="generator"/> + {% elif docutils_version[1] == 19 %}<meta content="Docutils 0.19: https://docutils.sourceforge.io/" name="generator"/> + {% elif docutils_version[1] == 20 %}<meta content="width=device-width, initial-scale=1" name="viewport"/> + {% endif %}<title> domdf_python_tools — sphinx-highlights-demo documentation