- Add upstream pygments.patch to fix compatibility with new Pygments

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest?expand=0&rev=147
2025-01-08 09:43:44 +00:00
parent 626c961f3f
commit 0b41864294
3 changed files with 111 additions and 1 deletions
--- a/pygments.patch
+++ b/pygments.patch
@@ -0,0 +1,102 @@
+From 7972182f2686dd8e1afa2f3e088af501d487eb28 Mon Sep 17 00:00:00 2001
+From: Florian Bruhin <me@the-compiler.org>
+Date: Tue, 7 Jan 2025 11:25:55 +0100
+Subject: [PATCH] Fix selftests with Pygments >= 2.19.0
+
+With Pygments 2.19, the Python lexer now emits
+Text.Whitespace (rather than Text) tokens after "def",
+which get highlighted as "bright black".
+
+See https://github.com/pygments/pygments/issues/1905
+Fixes #13112
+---
+ changelog/13112.contrib.rst |  1 +
+ testing/conftest.py         |  6 ++++++
+ testing/test_terminal.py    | 10 +++++-----
+ 3 files changed, 12 insertions(+), 5 deletions(-)
+ create mode 100644 changelog/13112.contrib.rst
+
+Index: pytest-8.3.4/changelog/13112.contrib.rst
+===================================================================
+--- /dev/null
+++ pytest-8.3.4/changelog/13112.contrib.rst
+@@ -0,0 +1 @@
+Fixed selftest failures in ``test_terminal.py`` with Pygments >= 2.19.0
+Index: pytest-8.3.4/testing/conftest.py
+===================================================================
+--- pytest-8.3.4.orig/testing/conftest.py
+++ pytest-8.3.4/testing/conftest.py
+@@ -6,6 +6,8 @@ import re
+ import sys
+ from typing import Generator
+ 
+import pygments
+
+ from _pytest.monkeypatch import MonkeyPatch
+ from _pytest.pytester import Pytester
+ import pytest
+@@ -168,6 +170,9 @@ def color_mapping():
+ 
+     Used by tests which check the actual colors output by pytest.
+     """
+    # https://github.com/pygments/pygments/commit/d24e272894a56a98b1b718d9ac5fabc20124882a
+    pygments_version = tuple(int(part) for part in pygments.__version__.split(".")[:2])
+    pygments_has_kwspace_hl = pygments_version >= (2, 19)
+ 
+     class ColorMapping:
+         COLORS = {
+@@ -180,6 +185,7 @@ def color_mapping():
+             "bold": "\x1b[1m",
+             "reset": "\x1b[0m",
+             "kw": "\x1b[94m",
+            "kwspace": "\x1b[90m \x1b[39;49;00m" if pygments_has_kwspace_hl else " ",
+             "hl-reset": "\x1b[39;49;00m",
+             "function": "\x1b[92m",
+             "number": "\x1b[94m",
+Index: pytest-8.3.4/testing/test_terminal.py
+===================================================================
+--- pytest-8.3.4.orig/testing/test_terminal.py
+++ pytest-8.3.4/testing/test_terminal.py
+@@ -1299,13 +1299,13 @@ def test_color_yes(pytester: Pytester, c
+                 "=*= FAILURES =*=",
+                 "{red}{bold}_*_ test_this _*_{reset}",
+                 "",
+-                "    {reset}{kw}def{hl-reset} {function}test_this{hl-reset}():{endline}",
+                "    {reset}{kw}def{hl-reset}{kwspace}{function}test_this{hl-reset}():{endline}",
+                 ">       fail(){endline}",
+                 "",
+                 "{bold}{red}test_color_yes.py{reset}:5: ",
+                 "_ _ * _ _*",
+                 "",
+-                "    {reset}{kw}def{hl-reset} {function}fail{hl-reset}():{endline}",
+                "    {reset}{kw}def{hl-reset}{kwspace}{function}fail{hl-reset}():{endline}",
+                 ">       {kw}assert{hl-reset} {number}0{hl-reset}{endline}",
+                 "{bold}{red}E       assert 0{reset}",
+                 "",
+@@ -2585,7 +2585,7 @@ class TestCodeHighlight:
+         result.stdout.fnmatch_lines(
+             color_mapping.format_for_fnmatch(
+                 [
+-                    "    {reset}{kw}def{hl-reset} {function}test_foo{hl-reset}():{endline}",
+                    "    {reset}{kw}def{hl-reset}{kwspace}{function}test_foo{hl-reset}():{endline}",
+                     ">       {kw}assert{hl-reset} {number}1{hl-reset} == {number}10{hl-reset}{endline}",
+                     "{bold}{red}E       assert 1 == 10{reset}",
+                 ]
+@@ -2607,7 +2607,7 @@ class TestCodeHighlight:
+         result.stdout.fnmatch_lines(
+             color_mapping.format_for_fnmatch(
+                 [
+-                    "    {reset}{kw}def{hl-reset} {function}test_foo{hl-reset}():{endline}",
+                    "    {reset}{kw}def{hl-reset}{kwspace}{function}test_foo{hl-reset}():{endline}",
+                     "        {print}print{hl-reset}({str}'''{hl-reset}{str}{hl-reset}",
+                     ">   {str}    {hl-reset}{str}'''{hl-reset}); {kw}assert{hl-reset} {number}0{hl-reset}{endline}",
+                     "{bold}{red}E       assert 0{reset}",
+@@ -2630,7 +2630,7 @@ class TestCodeHighlight:
+         result.stdout.fnmatch_lines(
+             color_mapping.format_for_fnmatch(
+                 [
+-                    "    {reset}{kw}def{hl-reset} {function}test_foo{hl-reset}():{endline}",
+                    "    {reset}{kw}def{hl-reset}{kwspace}{function}test_foo{hl-reset}():{endline}",
+                     ">       {kw}assert{hl-reset} {number}1{hl-reset} == {number}10{hl-reset}{endline}",
+                     "{bold}{red}E       assert 1 == 10{reset}",
+                 ]