From 2cb6dd89dc6feb41a5161d59595c8022e62c9ee8a64f4c77bc0ebdc15207d457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Dec 2024 10:50:10 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main python-Pygments revision e29275667afaa60ee7c30582040ae60b --- Pygments-2.15.1.tar.gz | 3 - pygments-2.18.0.tar.gz | 3 + python-Pygments.changes | 195 ++++++++++++++++++++++++++++++++- python-Pygments.spec | 27 +++-- skip-wcag-contrast-ratio.patch | 28 +++++ 5 files changed, 235 insertions(+), 21 deletions(-) delete mode 100644 Pygments-2.15.1.tar.gz create mode 100644 pygments-2.18.0.tar.gz create mode 100644 skip-wcag-contrast-ratio.patch diff --git a/Pygments-2.15.1.tar.gz b/Pygments-2.15.1.tar.gz deleted file mode 100644 index 8191c31..0000000 --- a/Pygments-2.15.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ace4d3c1dd481894b2005f560ead0f9f19ee64fe983366be1a21e171d12775c -size 4819591 diff --git a/pygments-2.18.0.tar.gz b/pygments-2.18.0.tar.gz new file mode 100644 index 0000000..41f0cc6 --- /dev/null +++ b/pygments-2.18.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199 +size 4891905 diff --git a/python-Pygments.changes b/python-Pygments.changes index 1feef26..336edaf 100644 --- a/python-Pygments.changes +++ b/python-Pygments.changes @@ -1,3 +1,189 @@ +------------------------------------------------------------------- +Mon May 6 14:52:55 UTC 2024 - Benoît Monin + +- update to version 2.18.0: + * New lexers: + + Janet (#2557) + + Lean 4 (#2618, #2626) + + Luau (#2605) + + Mojo (#2691, #2515) + + org-mode (#2628, #2636) + + Promela (#2620) + + Soong / ``Android.bp`` (#2659) + + Tact (#2571) + + Typst (#2596) + * Updated lexers: + + Awk: recognize ternary operator (#2687) + + Bash: add ``openrc`` alias (#2599, #2371) + + Coq: add keywords, lex more vernacular command arguments, + produce fewer tokens on heading comments (#2678) + + DNS zone files: Fix comment parsing (#2595) + + Hy: Support unicode literals (#1126) + + Inform6: Update to Inform 6.42 (#2644) + + lean: Fix name handling (#2614) + + Logtalk: add ``uninstantiation`` keyword and recognize escape + sequences (#2619) + + Macaulay2: Update to 1.23 (#2655) + + Python: fix highlighting of soft keywords before ``None``/ + ``True``/``False`` + + reStructuredText: use ``Token.Comment`` for comments instead + of ``Comment.Preproc`` (#2598) + + Rust: highlight ``:``, ``::`` and ``->`` as ``Punctuation`` + and whitespace as ``Whitespace``, instead of ``Text`` in both + cases (#2631) + + Spice: Add keywords (#2621) + + SQL Explain: allow negative numbers (#2610) + + Swift: Support multiline strings (#2681) + + ThingsDB: add constants and new functions; support template + strings (#2624) + + UL4: support nested ```` and ```` tags (#2597) + + VHDL: support multi-line comments of VHDL-2008 (#2622) + + Wikitext: Remove ``kk-*`` in ``variant_langs`` (#2647) + + Xtend: Add ``val`` and ``var`` (#2602) + * New styles: + + Coffee (#2609) + * Make background colors in the image formatter work with Pillow + 10.0 (#2623) + * Require Python 3.8. As a result, the ``importlib-metadata`` + package is no longer needed for fast plugin discovery on Python + 3.7. The ``plugins`` extra (used as, e.g., ``pip install + pygments[plugins]``) is kept for backwards compatibility but + now has no effect. (#2601) + * Require the ``url`` attribute for lexers inside Pygments, add + it to many lexers (#2588) + * Replace Pyflakes linter with Ruff (#2592) + * Add macOS CI (#2594) + * Built-in lexers now declare the version of Pygments in which + they were added in a required ``version_added`` lexer attribute + instead of a ``.. versionadded::`` directive in the docstring + (#2589, #2634) + * The ``url`` attribute is now required for built-in lexers and + has been added to all existing lexers (#2588) + * The RTF formatter supports line number and line highlighting + now (#1217, #2654) + * Add ``\sa0`` keyword in the RTF formatter (#1111, #2607) + * Register ``pycon`` as an alias for the Python console lexer + (#2697) + * Add MIME-Type for ``DesktopLexer`` (#2613) + * Fix native style to meet WCAG AA guidelines (#2600) + * Fix typo in documentation (#2672) + * Use format strings consistently (#2661) + * Add ``__class_getitem__`` to ``Formatter`` to improve typing + support (#2665) +- set the base python version to 3.8 +- drop the requirement of importlib-metadata: + already included in python 3.8 and above +- remove unneeded executable bit from some python files + +------------------------------------------------------------------- +Mon Nov 27 09:25:18 UTC 2023 - Dirk Müller + +- update to 2.17.2: + * Fix a packaging issue on macOS + * Updated lexers: + * TOML: Fix bug making lexing of single-quoted strings too + eager + * Cypher: fix comment matching, add missing keywords + * Fortran: add ``elseif`` keyword + * Lean: make it available as ``lean3``, in preparation for + * a possible switch to ``lean`` highlighting as Lean 4 + * JSON: add MIME types and file extensions for several line- + delimited JSON formats + * Nix: many improvements + * OCaml: Add ``and`` keyword, remove ``value`` from keywords + * Python: add ``starlark`` and ``bazel`` aliases + * Snowball: Treat ``len`` like ``size`` + * Spice: add ``panic`` keyword and ``->`` operator + * squid.conf: fix catastrophic backtracking + * TOML: rewritten, with many fixes + * Turtle: support blank nodes + * Wikitext: fix erroneous highlighting of LanguageConverter + markup + * CMake: support ``[=[ bracketed arguments ]=]``` + * Fix ctags support and tests + * Include ``Lexer.add_filter`` in the documentation + * Add a ``Lean3Lexer`` alias + * The ``pygments.styles`` module contains a new ``STYLES`` + variable with a dictionary of built-in styles. The old + ``STYLE_MAP`` variable, which uses a different format, + is kept for backwards compatibility. + * On Windows, add a new installation extra (``windows- + terminal``) which pulls in dependencies for colored + console output. See :doc:`cmdline` for more details. + * Support more file types in ``autopygmentize`` script + * Change color of numbers in ``rrt`` style + * Fix error when trying to look up plugin formatters by file + extension of the output format + * Use Hatchling as a build backend instead of setuptools. + * This change is transparent to most users. Distribution + packagers who build without build isolation need to add + hatchling as a build dependency and remove setuptools. + People downloading source distributions and wheels from PyPI + directly should note that they now have ``pygments`` in their + file names instead of ``Pygments``. + * Improve the test framework to also check for lost tokens when + processing the snippets and example files + * Improve the *Dracula* style definition to make it easier to + maintain + +------------------------------------------------------------------- +Sun Nov 5 07:15:50 UTC 2023 - Matěj Cepl + +- Add skip-wcag-contrast-ratio.patch to make + python-wcag-contrast-ratio just optional dependency + (gh#pygments/pygments!2564). + +------------------------------------------------------------------- +Mon Aug 7 13:10:31 UTC 2023 - Benoît Monin + +- update to version 2.16.1: + * Fix native style missing from style list (#2484) +- additional changes from version 2.16.0: + * New lexers: + + ASN.1 (#2462) + + Blueprint (#2434) + + BQN (#2472) + + DNS zone files (#2464) + + GraphQL (#2428) + + Linux desktop files (following the specification of the + Freedesktop group, formerly known as XDG) (#2470) + + NVIDIA PTX (#2432) + + OpenSCAD (#2449) + + systemd (#2470) + + TLS presentation language (#2455) + + Verifpal (#2430) + + YARA (#2453) + * Updated lexers: + + ASC: Add application/pem-certificate-chain mimetype (#2471) + + C/C++: Refine keyword lists (#2421, #2422) + + Carbon: Fix long processing times on invalid input, fix + number lexing (#2454, #2456) + + Elpi: Handle quotations (#2419) + + Go: Support additional built-ins (#2481) + + HTTP: Support empty headers (#2461), support more general + methods (#2460), also recognize responses in analyse_text + implementation (#2460), and highlight URL encoded data + (#2465, #1620) + + Igor Pro: Update to Igor Pro 9 (#2482) + + lean: Recognize expressions nested within attributes (#1817) + + Macaulay2: Update builtins (#2457) + + Markdown: Allow extra characters after language name in code + blocks (#2437) + + NestedText: Update to version 3 (#2459) + + scdoc: Improve language guessing implementation (#2402) + + Spice: Update to latest version (#2476) + + Transact SQL: Add Pre-sorted Group keyword (#2417) + + Uxntal: Update for current runes (#2424) + + Wikitext: Fix templates in wiki links; fix a language + converter false positive; add bold italic markup (#2447) + * Add Generic.EmphStrong token for bold italic markup (#2444) + * Add Lightbulb style (#2474) + * Improve contrast in Monokai style (#2448) + * Add documentation how to create terminal code highlighting + commands (#2131, #2425) + * Add support for loading TrueType fonts to the ImageFormatter + (#1960) + ------------------------------------------------------------------- Fri Apr 21 12:21:13 UTC 2023 - Dirk Müller @@ -319,7 +505,7 @@ Mon Jan 3 11:09:21 UTC 2022 - Martin Liška ------------------------------------------------------------------- Thu Sep 9 08:48:02 UTC 2021 - Stefan Schubert -- Use libalternatives instead of update-alternatives. +- Use libalternatives instead of update-alternatives. ------------------------------------------------------------------- Thu Jul 15 05:11:04 UTC 2021 - Matej Cepl @@ -332,7 +518,8 @@ Thu Jul 15 05:11:04 UTC 2021 - Matej Cepl Fri Jan 29 15:42:09 UTC 2021 - Matej Cepl - Update to 2.7.4 (all what was in the update to 2.7.2 and above - it): + it) (CVE-2021-20270, bsc#1183169, CVE-2021-27291, bsc#1184812): + * drops cve_2021_20270.patch, cve_2021_27291.patch in older dists - Updated lexers: * Ada (#1581) @@ -870,7 +1057,7 @@ Wed Mar 11 22:36:07 UTC 2015 - tbehrens@suse.com ------------------------------------------------------------------- Mon Apr 7 11:36:38 UTC 2014 - dmueller@suse.com -- add LICENSE to doc section +- add LICENSE to doc section ------------------------------------------------------------------- Thu Oct 24 11:11:51 UTC 2013 - speilicke@suse.com @@ -1001,5 +1188,5 @@ Tue Dec 09 23:28:25 UTC 2008 - cfarrell1980@gmail.com ------------------------------------------------------------------- Thu Jun 21 10:30:25 UTC 2007 - judas_iscariote@shorewall.net -- Initial package version. +- Initial package version. diff --git a/python-Pygments.spec b/python-Pygments.spec index c30e370..d0c2e71 100644 --- a/python-Pygments.spec +++ b/python-Pygments.spec @@ -1,7 +1,7 @@ # # spec file for package python-Pygments # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,31 +25,29 @@ %{?sle15_python_module_pythons} Name: python-Pygments -Version: 2.15.1 +Version: 2.18.0 Release: 0 Summary: A syntax highlighting package written in Python License: BSD-2-Clause Group: Development/Languages/Python URL: https://pygments.org -Source: https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-%{version}.tar.gz -BuildRequires: %{python_module base >= 3.7} +Source: https://files.pythonhosted.org/packages/source/P/Pygments/pygments-%{version}.tar.gz +# PATCH-FIX-UPSTREAM skip-wcag-contrast-ratio.patch gh#pygments/pygments!2564 mcepl@suse.com +# Don't make wcag-contrast-ratio mandatory for testing +Patch0: skip-wcag-contrast-ratio.patch +BuildRequires: %{python_module base >= 3.8} +BuildRequires: %{python_module hatchling} BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest >= 7} -BuildRequires: %{python_module setuptools >= 61} -BuildRequires: %{python_module wcag-contrast-ratio} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros >= 20210929 -# Preferred for plugin loading, see https://pygments.org/docs/plugins/ -%if 0%{?python_version_nodots} < 38 -Requires: python-importlib-metadata -%endif %if %{with libalternatives} Requires: alts BuildRequires: alts %else Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives %endif Provides: python-pygments = %{version} Obsoletes: python-pygments < %{version} @@ -69,7 +67,9 @@ source code. Highlights are: * highlights Brainfuck %prep -%autosetup -n Pygments-%{version} -p1 +%autosetup -n pygments-%{version} -p1 +# Remove unneeded executable bit +chmod -x pygments/formatters/_mapping.py pygments/lexers/gsql.py %build %pyproject_wheel @@ -84,7 +84,6 @@ install -Dm0644 doc/pygmentize.1 %{buildroot}%{_mandir}/man1/pygmentize.1 } %check -# skip test that requires wcag-contrast-ratio Python package %pytest %pre @@ -103,6 +102,6 @@ install -Dm0644 doc/pygmentize.1 %{buildroot}%{_mandir}/man1/pygmentize.1 %python_alternative %{_bindir}/pygmentize %python_alternative %{_mandir}/man1/pygmentize.1%{ext_man} %{python_sitelib}/pygments -%{python_sitelib}/Pygments-%{version}*-info +%{python_sitelib}/pygments-%{version}*-info %changelog diff --git a/skip-wcag-contrast-ratio.patch b/skip-wcag-contrast-ratio.patch new file mode 100644 index 0000000..930b843 --- /dev/null +++ b/skip-wcag-contrast-ratio.patch @@ -0,0 +1,28 @@ +--- + tests/contrast/test_contrasts.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +--- a/tests/contrast/test_contrasts.py ++++ b/tests/contrast/test_contrasts.py +@@ -14,7 +14,11 @@ import os + + import pygments.styles + import pygments.token +-import wcag_contrast_ratio ++try: ++ import wcag_contrast_ratio ++except ImportError: ++ wcag_contrast_ratio = None ++import unittest + + JSON_FILENAME = os.path.join(os.path.dirname(__file__), "min_contrasts.json") + WCAG_AA_CONTRAST = 4.5 +@@ -67,6 +71,8 @@ def update_json(): + ) + + ++@unittest.skipIf(wcag_contrast_ratio is None, ++ "wcag-contrast-ratio has not been installed") + def test_contrasts(fail_if_improved=True): + with open(JSON_FILENAME, encoding="utf-8") as f: + previous_contrasts = json.load(f)