Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-Pygments for openSUSE:Factory
checked in at 2022-02-09 20:38:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Pygments (Old)
and /work/SRC/openSUSE:Factory/.python-Pygments.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Pygments"
Wed Feb 9 20:38:12 2022 rev:35 rq:952059 version:2.11.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Pygments/python-Pygments.changes
2021-11-09 23:53:56.059931936 +0100
+++
/work/SRC/openSUSE:Factory/.python-Pygments.new.1898/python-Pygments.changes
2022-02-09 20:38:19.302249914 +0100
@@ -1,0 +2,31 @@
+Sun Feb 6 21:20:22 UTC 2022 - Beno??t Monin <[email protected]>
+
+- 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 <[email protected]>
+
+- 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 <[email protected]>
+
+- Update to 2.11.1:
+ https://github.com/pygments/pygments/blob/master/CHANGES
+- Remove one test as it requires wcag-contrast-ratio Python package.
+
+-------------------------------------------------------------------
Old:
----
Pygments-2.9.0.tar.gz
New:
----
Pygments-2.11.2.tar.gz
elpi_fix_catastrophic_backtracking.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Pygments.spec ++++++
--- /var/tmp/diff_new_pack.6KStMj/_old 2022-02-09 20:38:19.810251129 +0100
+++ /var/tmp/diff_new_pack.6KStMj/_new 2022-02-09 20:38:19.818251148 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-Pygments
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,18 +26,20 @@
%define skip_python2 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-Pygments
-# DO NOT UPGRADE UNTIL PELICAN IS COMPATIBLE!
-Version: 2.9.0
+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
BuildRequires: %{python_module pytest}
+BuildRequires: %{python_module lxml}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros >= 20210929
@@ -67,10 +69,7 @@
* highlights Brainfuck
%prep
-%setup -q -n Pygments-%{version}
-
-# Remove unnecessary shebang
-# sed -i '1 { /^#!/ d }' pygments/lexers/_usd_builtins.py
+%autosetup -n Pygments-%{version} -p1
%build
%python_build
@@ -97,6 +96,8 @@
%python_uninstall_alternative pygmentize
%check
+# skip test that requires wcag-contrast-ratio Python package
+rm ./tests/contrast/test_contrasts.py
%pytest
%files %{python_files}
++++++ Pygments-2.9.0.tar.gz -> Pygments-2.11.2.tar.gz ++++++
++++ 620780 lines of diff (skipped)
++++++ elpi_fix_catastrophic_backtracking.patch ++++++
>From dbd7931f9d60966fbb80745db368ad773a8b7569 Mon Sep 17 00:00:00 2001
From: Jean Abou-Samra <[email protected]>
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
