Daniel Garcia
44ed368a82
- Add pygments-2.14.patch in order to fix Pygments tests after the 2.14 release. OBS-URL: https://build.opensuse.org/request/show/1046681 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=225
111 lines
4.6 KiB
Diff
111 lines
4.6 KiB
Diff
From 965768bfda2a00ba6466cdb12a7a46efdce47023 Mon Sep 17 00:00:00 2001
|
|
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
|
|
Date: Sun, 1 Jan 2023 19:17:03 +0000
|
|
Subject: [PATCH] Fix tests for Pygments 2.14
|
|
|
|
Pygments 2.14 was released on 01/01/2023 [0]
|
|
|
|
[0]: https://pygments.org/docs/changelog/#version-2-14-0
|
|
---
|
|
pyproject.toml | 2 +-
|
|
tests/test_ext_viewcode.py | 27 +++++++++++++++++++--------
|
|
tests/test_intl.py | 11 +++++++++--
|
|
3 files changed, 29 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/pyproject.toml b/pyproject.toml
|
|
index 8757572f6e7..23092f302dc 100644
|
|
--- a/pyproject.toml
|
|
+++ b/pyproject.toml
|
|
@@ -62,7 +62,7 @@ dependencies = [
|
|
"sphinxcontrib-serializinghtml>=1.1.5",
|
|
"sphinxcontrib-qthelp",
|
|
"Jinja2>=3.0",
|
|
- "Pygments>=2.12",
|
|
+ "Pygments>=2.13",
|
|
"docutils>=0.18,<0.20",
|
|
"snowballstemmer>=2.0",
|
|
"babel>=2.9",
|
|
diff --git a/tests/test_ext_viewcode.py b/tests/test_ext_viewcode.py
|
|
index 7750b8da055..6d443d1c6d7 100644
|
|
--- a/tests/test_ext_viewcode.py
|
|
+++ b/tests/test_ext_viewcode.py
|
|
@@ -2,6 +2,7 @@
|
|
|
|
import re
|
|
|
|
+import pygments
|
|
import pytest
|
|
|
|
|
|
@@ -31,14 +32,24 @@ def test_viewcode(app, status, warning):
|
|
|
|
result = (app.outdir / '_modules/spam/mod1.html').read_text(encoding='utf8')
|
|
result = re.sub('<span class=".*?">', '<span>', result) # filter pygments classes
|
|
- assert ('<div class="viewcode-block" id="Class1"><a class="viewcode-back" '
|
|
- 'href="../../index.html#spam.Class1">[docs]</a>'
|
|
- '<span>@decorator</span>\n'
|
|
- '<span>class</span> <span>Class1</span>'
|
|
- '<span>(</span><span>object</span><span>):</span>\n'
|
|
- ' <span>"""</span>\n'
|
|
- '<span> this is Class1</span>\n'
|
|
- '<span> """</span></div>\n') in result
|
|
+ if pygments.__version__ >= '2.14.0':
|
|
+ assert ('<div class="viewcode-block" id="Class1"><a class="viewcode-back" '
|
|
+ 'href="../../index.html#spam.Class1">[docs]</a>'
|
|
+ '<span>@decorator</span>\n'
|
|
+ '<span>class</span> <span>Class1</span>'
|
|
+ '<span>(</span><span>object</span><span>):</span>\n'
|
|
+ '<span> </span><span>"""</span>\n'
|
|
+ '<span> this is Class1</span>\n'
|
|
+ '<span> """</span></div>\n') in result
|
|
+ else:
|
|
+ assert ('<div class="viewcode-block" id="Class1"><a class="viewcode-back" '
|
|
+ 'href="../../index.html#spam.Class1">[docs]</a>'
|
|
+ '<span>@decorator</span>\n'
|
|
+ '<span>class</span> <span>Class1</span>'
|
|
+ '<span>(</span><span>object</span><span>):</span>\n'
|
|
+ ' <span>"""</span>\n'
|
|
+ '<span> this is Class1</span>\n'
|
|
+ '<span> """</span></div>\n') in result
|
|
|
|
|
|
@pytest.mark.sphinx('epub', testroot='ext-viewcode')
|
|
diff --git a/tests/test_intl.py b/tests/test_intl.py
|
|
index efe6c9bce93..07dfe8be3f4 100644
|
|
--- a/tests/test_intl.py
|
|
+++ b/tests/test_intl.py
|
|
@@ -6,6 +6,7 @@
|
|
import os
|
|
import re
|
|
|
|
+import pygments
|
|
import pytest
|
|
from babel.messages import mofile, pofile
|
|
from babel.messages.catalog import Catalog
|
|
@@ -1104,8 +1105,11 @@ def test_additional_targets_should_not_be_translated(app):
|
|
expected_expr = ("""<span class="n">literal</span>"""
|
|
"""<span class="o">-</span>"""
|
|
"""<span class="n">block</span>\n"""
|
|
- """<span class="k">in</span> """
|
|
+ """<span class="k">in</span>"""
|
|
+ """<span class="w"> </span>"""
|
|
"""<span class="n">list</span>""")
|
|
+ if pygments.__version__ < '2.14.0':
|
|
+ expected_expr = expected_expr.replace("""<span class="w"> </span>""", ' ')
|
|
assert_count(expected_expr, result, 1)
|
|
|
|
# doctest block should not be translated but be highlighted
|
|
@@ -1179,8 +1183,11 @@ def test_additional_targets_should_be_translated(app):
|
|
expected_expr = ("""<span class="no">LITERAL</span>"""
|
|
"""<span class="o">-</span>"""
|
|
"""<span class="no">BLOCK</span>\n"""
|
|
- """<span class="no">IN</span> """
|
|
+ """<span class="no">IN</span>"""
|
|
+ """<span class="w"> </span>"""
|
|
"""<span class="no">LIST</span>""")
|
|
+ if pygments.__version__ < '2.14.0':
|
|
+ expected_expr = expected_expr.replace("""<span class="w"> </span>""", ' ')
|
|
assert_count(expected_expr, result, 1)
|
|
|
|
# doctest block should not be translated but be highlighted
|