From 26159d6839a27f0bcf95e37d7b48ec7c4d2b41df Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Thu, 10 Aug 2023 12:09:21 +0100
Subject: [PATCH 1/3] Require Pygments 2.14 or later
---
CHANGES | 1 +
pyproject.toml | 2 +-
tests/test_ext_viewcode.py | 5 +----
tests/test_intl.py | 4 ----
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/CHANGES b/CHANGES
index 563ddbfeecd..896d4a0e0a0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ Dependencies
------------
* #11511: Drop Python 3.8 support.
+* #XXX: Require Pygments 2.14 or later.
Incompatible changes
--------------------
diff --git a/pyproject.toml b/pyproject.toml
index cf90df95371..d927fa43dc2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -61,7 +61,7 @@ dependencies = [
"sphinxcontrib-serializinghtml>=1.1.5",
"sphinxcontrib-qthelp",
"Jinja2>=3.0",
- "Pygments>=2.13",
+ "Pygments>=2.14",
"docutils>=0.18.1,<0.21",
"snowballstemmer>=2.0",
"babel>=2.9",
diff --git a/tests/test_ext_viewcode.py b/tests/test_ext_viewcode.py
index 74df2a4c566..25c029b8b8b 100644
--- a/tests/test_ext_viewcode.py
+++ b/tests/test_ext_viewcode.py
@@ -34,10 +34,7 @@ def check_viewcode_output(app, warning):
'[docs]\n') in result
assert '@decorator\n' in result
assert 'class Class1:\n' in result
- if pygments.__version__ >= '2.14.0':
- assert ' """\n' in result
- else:
- assert ' """\n' in result
+ assert ' """\n' in result
assert ' this is Class1\n' in result
assert ' """\n' in result
diff --git a/tests/test_intl.py b/tests/test_intl.py
index 3acdc5d0b9b..72778422b93 100644
--- a/tests/test_intl.py
+++ b/tests/test_intl.py
@@ -1170,8 +1170,6 @@ def test_additional_targets_should_not_be_translated(app):
"""in"""
""" """
"""list""")
- if pygments.__version__ < '2.14.0':
- expected_expr = expected_expr.replace(""" """, ' ')
assert_count(expected_expr, result, 1)
# doctest block should not be translated but be highlighted
@@ -1248,8 +1246,6 @@ def test_additional_targets_should_be_translated(app):
"""IN"""
""" """
"""LIST""")
- if pygments.__version__ < '2.14.0':
- expected_expr = expected_expr.replace(""" """, ' ')
assert_count(expected_expr, result, 1)
# doctest block should not be translated but be highlighted
From f82ea4b9d9057e119e1123f701c8c5505a0ff7c3 Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Thu, 10 Aug 2023 12:11:09 +0100
Subject: [PATCH 2/3] Number
---
CHANGES | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGES b/CHANGES
index 896d4a0e0a0..073d436d0cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,7 @@ Dependencies
------------
* #11511: Drop Python 3.8 support.
-* #XXX: Require Pygments 2.14 or later.
+* #11576: Require Pygments 2.14 or later.
Incompatible changes
--------------------
From 2a21da34de9b90447a14bddd9ca1160909ef9592 Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Thu, 10 Aug 2023 12:27:03 +0100
Subject: [PATCH 3/3] imports
---
tests/test_ext_viewcode.py | 1 -
tests/test_intl.py | 1 -
2 files changed, 2 deletions(-)
diff --git a/tests/test_ext_viewcode.py b/tests/test_ext_viewcode.py
index 25c029b8b8b..a1a0a6d56b5 100644
--- a/tests/test_ext_viewcode.py
+++ b/tests/test_ext_viewcode.py
@@ -3,7 +3,6 @@
import re
import shutil
-import pygments
import pytest
diff --git a/tests/test_intl.py b/tests/test_intl.py
index 72778422b93..a72492333f8 100644
--- a/tests/test_intl.py
+++ b/tests/test_intl.py
@@ -10,7 +10,6 @@
import time
from pathlib import Path
-import pygments
import pytest
from babel.messages import mofile, pofile
from babel.messages.catalog import Catalog