Accepting request 951979 from home:benoit_monin:branches:devel:languages:python

- update to 2.11.2
- backport elpi_fix_catastrophic_backtracking.patch
- switch prep stage to autosetup
- remove commented-out shebang removal

OBS-URL: https://build.opensuse.org/request/show/951979
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pygments?expand=0&rev=80

Pygments-2.11.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:59b895e326f0fb0d733fd28c6839bd18ad0687ba20efc26d4277fd1d30b971f4
-size 4206490

Pygments-2.11.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a
+size 4206258

elpi_fix_catastrophic_backtracking.patch

@@ -0,0 +1,39 @@
+From dbd7931f9d60966fbb80745db368ad773a8b7569 Mon Sep 17 00:00:00 2001
+From: Jean Abou-Samra <jean@abou-samra.fr>
+Date: Thu, 3 Feb 2022 22:27:01 +0100
+Subject: [PATCH] Elpi: fix catastrophic backtracking (#2061)
+
+---
+ pygments/lexers/elpi.py                                | 4 ++--
+ tests/snippets/elpi/test_catastrophic_backtracking.txt | 6 ++++++
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+ create mode 100644 tests/snippets/elpi/test_catastrophic_backtracking.txt
+
+diff --git a/pygments/lexers/elpi.py b/pygments/lexers/elpi.py
+index 691182a86..3ce6ed6a2 100644
+--- a/pygments/lexers/elpi.py
++++ b/pygments/lexers/elpi.py
+@@ -32,9 +32,9 @@ class ElpiLexer(RegexLexer):
+     schar2_re = r"([+*^?/<>`'@#~=&!])"
+     schar_re = r"({}|-|\$|_)".format(schar2_re)
+     idchar_re = r"({}|{}|{}|{})".format(lcase_re,ucase_re,digit_re,schar_re)
+-    idcharstarns_re = r"({}+|(?=\.[a-z])\.{}+)".format(idchar_re,idchar_re)
++    idcharstarns_re = r"({}*(\.({}|{}){}*)*)".format(idchar_re, lcase_re, ucase_re, idchar_re)
+     symbchar_re = r"({}|{}|{}|{}|:)".format(lcase_re, ucase_re, digit_re, schar_re)
+-    constant_re = r"({}{}*|{}{}*|{}{}*|_{}+)".format(ucase_re, idchar_re, lcase_re, idcharstarns_re,schar2_re, symbchar_re,idchar_re)
++    constant_re = r"({}{}*|{}{}|{}{}*|_{}+)".format(ucase_re, idchar_re, lcase_re, idcharstarns_re,schar2_re, symbchar_re,idchar_re)
+     symbol_re=r"(,|<=>|->|:-|;|\?-|->|&|=>|\bas\b|\buvar\b|<|=<|=|==|>=|>|\bi<|\bi=<|\bi>=|\bi>|\bis\b|\br<|\br=<|\br>=|\br>|\bs<|\bs=<|\bs>=|\bs>|@|::|\[\]|`->|`:|`:=|\^|-|\+|\bi-|\bi\+|r-|r\+|/|\*|\bdiv\b|\bi\*|\bmod\b|\br\*|~|\bi~|\br~)"
+     escape_re=r"\(({}|{})\)".format(constant_re,symbol_re)
+     const_sym_re = r"({}|{}|{})".format(constant_re,symbol_re,escape_re)
+diff --git a/tests/snippets/elpi/test_catastrophic_backtracking.txt b/tests/snippets/elpi/test_catastrophic_backtracking.txt
+new file mode 100644
+index 000000000..a14a0549c
+--- /dev/null
++++ b/tests/snippets/elpi/test_catastrophic_backtracking.txt
+@@ -0,0 +1,6 @@
++---input---
++aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
++
++---tokens---
++'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' Text
++'\n'          Text.Whitespace

python-Pygments.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Sun Feb  6 21:20:22 UTC 2022 - Benoît Monin <benoit.monin@gmx.fr>
+
+- backport elpi_fix_catastrophic_backtracking.patch:
+  fix build getting stuck when running the tests
+- switch prep stage to autosetup
+- remove commented-out shebang removal
+
+-------------------------------------------------------------------
+Wed Jan 12 19:53:14 UTC 2022 - Benoît Monin <benoit.monin@gmx.fr>
+
+- update to 2.11.2:
+  * Updated lexers:
+    + C-family: Fix incorrect handling of labels (#2022, #1996,
+      #1182)
+    + Java: Fixed an issue with record keywords result in Error
+      tokens in some cases (#2018)
+  * Fix links to line numbers not working correctly (#2014)
+  * Remove underline from Whitespace style in the Tango theme
+    (#2020)
+  * Fix IRC and Terminal256 formatters not backtracking correctly
+    for custom token types, resulting in some unstyled tokens
+    (#1986)
+
 -------------------------------------------------------------------
 Mon Jan  3 11:09:21 UTC 2022 - Martin Liška <mliska@suse.cz>
 

python-Pygments.spec

@@ -26,13 +26,15 @@
 %define skip_python2 1
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-Pygments
-Version:        2.11.1
+Version:        2.11.2
 Release:        0
 Summary:        A syntax highlighting package written in Python
 License:        BSD-2-Clause
 Group:          Development/Languages/Python
 URL:            http://pygments.org
 Source:         https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM -- backported from dbd7931f9d60
+Patch1:         elpi_fix_catastrophic_backtracking.patch
 BuildRequires:  %{python_module base >= 3.5}
 # We need pytest just because of its test runner, it seems even
 # python3 stdlib unittest runner doesn't work
@@ -67,10 +69,7 @@ source code. Highlights are:
  * highlights Brainfuck
 
 %prep
-%setup -q -n Pygments-%{version}
+%autosetup -n Pygments-%{version} -p1
-
-# Remove unnecessary shebang
-# sed -i '1 { /^#!/ d }' pygments/lexers/_usd_builtins.py
 
 %build
 %python_build