From f9adb70d9ced0314820e21a3cb0bd4081d58a6bd69e21e5f1223055f5370ad0e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 11 Jul 2024 14:25:32 +0000 Subject: [PATCH 1/5] - add buildignores to avoid bootstrap buildcycle p11-kit/gtk-doc/python-Pygments which comes via pip/ca-certificates OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pygments?expand=0&rev=115 --- python-Pygments.changes | 7 +++++++ python-Pygments.spec | 13 +++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/python-Pygments.changes b/python-Pygments.changes index 336edaf..0cf6099 100644 --- a/python-Pygments.changes +++ b/python-Pygments.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jul 11 14:24:45 UTC 2024 - Dirk Müller + +- add buildignores to avoid bootstrap buildcycle + p11-kit/gtk-doc/python-Pygments which comes via + pip/ca-certificates + ------------------------------------------------------------------- Mon May 6 14:52:55 UTC 2024 - Benoît Monin diff --git a/python-Pygments.spec b/python-Pygments.spec index d0c2e71..9f7876d 100644 --- a/python-Pygments.spec +++ b/python-Pygments.spec @@ -22,7 +22,6 @@ %else %bcond_with libalternatives %endif - %{?sle15_python_module_pythons} Name: python-Pygments Version: 2.18.0 @@ -31,7 +30,7 @@ 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 +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 @@ -42,16 +41,18 @@ BuildRequires: %{python_module pytest >= 7} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros >= 20210929 +#!BuildIgnore: ca-certificates:p11-kit +#!BuildIgnore: ca-certificates:p11-kit-tools +Provides: python-pygments = %{version} +Obsoletes: python-pygments < %{version} +BuildArch: noarch %if %{with libalternatives} -Requires: alts BuildRequires: alts +Requires: alts %else Requires(post): update-alternatives Requires(postun): update-alternatives %endif -Provides: python-pygments = %{version} -Obsoletes: python-pygments < %{version} -BuildArch: noarch %python_subpackages %description From 4e3daffee335e18f08d85a3dff288ffe748493afe6acbddb6198a4ea3724f9c7 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 15 Jul 2024 14:30:18 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pygments?expand=0&rev=116 --- python-Pygments.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-Pygments.spec b/python-Pygments.spec index 9f7876d..9075049 100644 --- a/python-Pygments.spec +++ b/python-Pygments.spec @@ -43,6 +43,7 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros >= 20210929 #!BuildIgnore: ca-certificates:p11-kit #!BuildIgnore: ca-certificates:p11-kit-tools +BuildRequires: ca-certificates-mozilla-prebuilt Provides: python-pygments = %{version} Obsoletes: python-pygments < %{version} BuildArch: noarch From 005c61b4ee9f45dd7726af6dce2d11e201b7f5191edc7f404efae048e656808e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Monin?= Date: Fri, 9 Aug 2024 08:55:04 +0000 Subject: [PATCH 3/5] Accepting request 1191413 from home:benoit_monin:branches:devel:languages:python fix build by forcing pip to use the prebuilt CA bundle OBS-URL: https://build.opensuse.org/request/show/1191413 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pygments?expand=0&rev=117 --- python-Pygments.changes | 5 +++++ python-Pygments.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/python-Pygments.changes b/python-Pygments.changes index 0cf6099..4cd2d5c 100644 --- a/python-Pygments.changes +++ b/python-Pygments.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Aug 3 11:42:54 UTC 2024 - Benoît Monin + +- fix build by forcing pip to use the prebuilt CA bundle + ------------------------------------------------------------------- Thu Jul 11 14:24:45 UTC 2024 - Dirk Müller diff --git a/python-Pygments.spec b/python-Pygments.spec index 9075049..288b9e9 100644 --- a/python-Pygments.spec +++ b/python-Pygments.spec @@ -74,9 +74,13 @@ source code. Highlights are: chmod -x pygments/formatters/_mapping.py pygments/lexers/gsql.py %build +# Point pip to the prebuilt CA bundle +export _PIP_STANDALONE_CERT=/usr/share/factory/var/lib/ca-certificates/ca-bundle.pem %pyproject_wheel %install +# Point pip to the prebuilt CA bundle +export _PIP_STANDALONE_CERT=/usr/share/factory/var/lib/ca-certificates/ca-bundle.pem %pyproject_install install -Dm0644 doc/pygmentize.1 %{buildroot}%{_mandir}/man1/pygmentize.1 %python_clone -a %{buildroot}%{_bindir}/pygmentize From f829fbe43bfb9db690076223b5772d1f69d63bdd917a5741d59ea7f2c43453e1 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 6 Jan 2025 21:56:27 +0000 Subject: [PATCH 4/5] Accepting request 1235390 from home:benoit_monin:branches:devel:languages:python update to version 2.19.1 OBS-URL: https://build.opensuse.org/request/show/1235390 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pygments?expand=0&rev=118 --- pygments-2.18.0.tar.gz | 3 --- pygments-2.19.1.tar.gz | 3 +++ python-Pygments.changes | 59 +++++++++++++++++++++++++++++++++++++++++ python-Pygments.spec | 4 +-- 4 files changed, 64 insertions(+), 5 deletions(-) delete mode 100644 pygments-2.18.0.tar.gz create mode 100644 pygments-2.19.1.tar.gz diff --git a/pygments-2.18.0.tar.gz b/pygments-2.18.0.tar.gz deleted file mode 100644 index 41f0cc6..0000000 --- a/pygments-2.18.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199 -size 4891905 diff --git a/pygments-2.19.1.tar.gz b/pygments-2.19.1.tar.gz new file mode 100644 index 0000000..5d6e3a7 --- /dev/null +++ b/pygments-2.19.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f +size 4968581 diff --git a/python-Pygments.changes b/python-Pygments.changes index 4cd2d5c..9510a93 100644 --- a/python-Pygments.changes +++ b/python-Pygments.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Mon Jan 6 18:00:26 UTC 2025 - Benoît Monin + +- update to version 2.19.1: + * Ini: Fix quoted string regression introduced in 2.19.0 + * Lua: Fix a regression introduced in 2.19.0 +- additional changes from version 2.19.0: + * New lexers: + + CodeQL (#2819) + + Debian Sources (#2788, #2747) + + Gleam (#2662) + + GoogleSQL (#2820, #2814) + + JSON5 (#2734, #1880) + + Maple (#2763, #2548) + + NumbaIR (#2433) + + PDDL (#2799, #2616) + + Rego (#2794) + + TableGen (#2751) + + Vue.js (#2832) + * Updated lexers: + + BQN: Various improvements (#2789) + + C#: Fix number highlighting (#986, #2727), add ``file`` + keyword (#2726, #2805, #2806), add various other keywords + (#2745, #2770) + + CSS: Add ``revert`` (#2766, #2775) + + Debian control: Add ``Change-By`` field (#2757) + + Elip: Improve punctuation handling (#2651) + + Igor: Add ``int`` (#2801) + + Ini: Fix quoted strings with embedded comment characters + (#2767, #2720) + + Java: Support functions returning types containing a question + mark (#2737) + + JavaScript: Support private identiiers (#2729, #2671) + + LLVM: Add ``splat``, improve floating-point number parsing + (#2755) + + Lua: Improve variable detection, add built-in functions + (#2829) + + Macaulay2: Update to 1.24.11 (#2800) + + PostgreSQL: Add more ``EXPLAIN`` keywords (#2785), + handle ``/`` (#2774) + + S-Lexer: Fix keywords (#2082, #2750) + + TransactSQL: Fix single-line comments (#2717) + + Turtle: Fix triple quoted strings (#2744, #2758) + + Typst: Various improvements (#2724) + + Various: Add ``^`` as an operator to Matlab, Octave and + Scilab (#2798) + + Vyper: Add ``staticcall`` and ``extcall`` (#2719) + * Mark file extensions for ``HTML/XML+Evoque`` as aliases (#2743) + * Add a color for ``Operator.Word`` to the ``rrt`` style (#2709) + * Fix broken link in the documentation (#2803, #2804) + * Drop executable bit where not needed (#2781) + * Reduce Mojo priority relative to Python in ``analyze_text´` + (#2771, #2772) + * Fix documentation builds (#2712) + * Match example file names to the lexer's name (#2713, #2715) + * Ensure lexer metadata is present (#2714) + * Search more directories on macOS for fonts (#2809) + * Improve test robustness (#2812) + ------------------------------------------------------------------- Sat Aug 3 11:42:54 UTC 2024 - Benoît Monin diff --git a/python-Pygments.spec b/python-Pygments.spec index 288b9e9..baa5322 100644 --- a/python-Pygments.spec +++ b/python-Pygments.spec @@ -1,7 +1,7 @@ # # spec file for package python-Pygments # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ %endif %{?sle15_python_module_pythons} Name: python-Pygments -Version: 2.18.0 +Version: 2.19.1 Release: 0 Summary: A syntax highlighting package written in Python License: BSD-2-Clause From 0cd78196c370a15c2c28d2dbfeef8bb416b795088c6278a84a4794b49f074a0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Thu, 23 Jan 2025 11:32:10 +0000 Subject: [PATCH 5/5] Accepting request 1239844 from home:mcalabkova:branches:devel:languages:python - Drop dependency on ca-certificates-mozilla-prebuilt to really avoid buildcycles OBS-URL: https://build.opensuse.org/request/show/1239844 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pygments?expand=0&rev=119 --- python-Pygments.changes | 6 ++++++ python-Pygments.spec | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/python-Pygments.changes b/python-Pygments.changes index 9510a93..54fcf56 100644 --- a/python-Pygments.changes +++ b/python-Pygments.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 23 11:20:48 UTC 2025 - Markéta Machová + +- Drop dependency on ca-certificates-mozilla-prebuilt to really + avoid buildcycles + ------------------------------------------------------------------- Mon Jan 6 18:00:26 UTC 2025 - Benoît Monin diff --git a/python-Pygments.spec b/python-Pygments.spec index baa5322..90be5fb 100644 --- a/python-Pygments.spec +++ b/python-Pygments.spec @@ -43,7 +43,6 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros >= 20210929 #!BuildIgnore: ca-certificates:p11-kit #!BuildIgnore: ca-certificates:p11-kit-tools -BuildRequires: ca-certificates-mozilla-prebuilt Provides: python-pygments = %{version} Obsoletes: python-pygments < %{version} BuildArch: noarch @@ -74,13 +73,9 @@ source code. Highlights are: chmod -x pygments/formatters/_mapping.py pygments/lexers/gsql.py %build -# Point pip to the prebuilt CA bundle -export _PIP_STANDALONE_CERT=/usr/share/factory/var/lib/ca-certificates/ca-bundle.pem %pyproject_wheel %install -# Point pip to the prebuilt CA bundle -export _PIP_STANDALONE_CERT=/usr/share/factory/var/lib/ca-certificates/ca-bundle.pem %pyproject_install install -Dm0644 doc/pygmentize.1 %{buildroot}%{_mandir}/man1/pygmentize.1 %python_clone -a %{buildroot}%{_bindir}/pygmentize