From 976dd07ffe1e69903bc404920348e50d460a30a6 Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Date: Thu, 10 Aug 2023 12:35:45 +0100
Subject: [PATCH] Require Pygments 2.14 or later (#11576)

---
 CHANGES                    | 1 +
 pyproject.toml             | 2 +-
 tests/test_ext_viewcode.py | 6 +-----
 tests/test_intl.py         | 5 -----
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index 563ddbfee..073d436d0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ Dependencies
 ------------
 
 * #11511: Drop Python 3.8 support.
+* #11576: Require Pygments 2.14 or later.
 
 Incompatible changes
 --------------------
diff --git a/pyproject.toml b/pyproject.toml
index cf90df953..d927fa43d 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 74df2a4c5..a1a0a6d56 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
 
 
@@ -34,10 +33,7 @@ def check_viewcode_output(app, warning):
             '<a class="viewcode-back" href="../../index.html#spam.Class1">[docs]</a>\n') in result
     assert '<span>@decorator</span>\n' in result
     assert '<span>class</span> <span>Class1</span><span>:</span>\n' in result
-    if pygments.__version__ >= '2.14.0':
-        assert '<span>    </span><span>&quot;&quot;&quot;</span>\n' in result
-    else:
-        assert '    <span>&quot;&quot;&quot;</span>\n' in result
+    assert '<span>    </span><span>&quot;&quot;&quot;</span>\n' in result
     assert '<span>    this is Class1</span>\n' in result
     assert '<span>    &quot;&quot;&quot;</span>\n' in result
 
diff --git a/tests/test_intl.py b/tests/test_intl.py
index 3acdc5d0b..a72492333 100644
--- a/tests/test_intl.py
+++ b/tests/test_intl.py
@@ -10,7 +10,6 @@ import shutil
 import time
 from pathlib import Path
 
-import pygments
 import pytest
 from babel.messages import mofile, pofile
 from babel.messages.catalog import Catalog
@@ -1170,8 +1169,6 @@ def test_additional_targets_should_not_be_translated(app):
                      """<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
@@ -1248,8 +1245,6 @@ def test_additional_targets_should_be_translated(app):
                      """<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