From f615aa42e328f6046f98e9c7742ad4eb2302b5c1 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Wed, 24 Apr 2024 08:32:50 -0700 Subject: [PATCH] dev-python/pygments-github-lexers: Revbump, add py312 (bug #929490) Add patch to get rid of warnings about invalid escape sequences. Closes: https://bugs.gentoo.org/929490 Signed-off-by: Patrick McLean --- ...github-lexers-0.0.5-escape-sequences.patch | 22 +++++++++++++++++++ .../pygments-github-lexers/metadata.xml | 2 +- ...=> pygments-github-lexers-0.0.5-r2.ebuild} | 9 +++++--- 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 dev-python/pygments-github-lexers/files/pygments-github-lexers-0.0.5-escape-sequences.patch rename dev-python/pygments-github-lexers/{pygments-github-lexers-0.0.5-r1.ebuild => pygments-github-lexers-0.0.5-r2.ebuild} (74%) diff --git a/dev-python/pygments-github-lexers/files/pygments-github-lexers-0.0.5-escape-sequences.patch b/dev-python/pygments-github-lexers/files/pygments-github-lexers-0.0.5-escape-sequences.patch new file mode 100644 index 0000000000000..65c90e857bb28 --- /dev/null +++ b/dev-python/pygments-github-lexers/files/pygments-github-lexers-0.0.5-escape-sequences.patch @@ -0,0 +1,22 @@ +diff --git a/pygments_github_lexers/github.py b/pygments_github_lexers/github.py +index d2fa4b2..36a5c94 100644 +--- a/pygments_github_lexers/github.py ++++ b/pygments_github_lexers/github.py +@@ -53,7 +53,7 @@ class Dasm16Lexer(RegexLexer): + + # Regexes yo + char = r'[a-zA-Z$._0-9@]' +- identifier = r'(?:[a-zA-Z$_]' + char + '*|\.' + char + '+)' ++ identifier = r'(?:[a-zA-Z$_]' + char + r'*|\.' + char + '+)' + number = r'[+-]?(?:0[xX][a-zA-Z0-9]+|\d+)' + binary_number = r'0b[01_]+' + instruction = r'(?i)(' + '|'.join(INSTRUCTIONS) + ')' +@@ -379,7 +379,7 @@ class TOMLLexer(RegexLexer): + (r'#.*?$', Comment.Single), + (r'"(\\\\|\\"|[^"])*"', String), + (r'(true|false)$', Keyword.Constant), +- ('[a-zA-Z_][a-zA-Z0-9_\-]*', Name), ++ (r'[a-zA-Z_][a-zA-Z0-9_\-]*', Name), + + # Datetime + (r'\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z', Number.Integer), diff --git a/dev-python/pygments-github-lexers/metadata.xml b/dev-python/pygments-github-lexers/metadata.xml index ad287ae27558f..90e6c7f88d464 100644 --- a/dev-python/pygments-github-lexers/metadata.xml +++ b/dev-python/pygments-github-lexers/metadata.xml @@ -6,7 +6,7 @@ Patrick McLean - pygments-github-lexers + pygments-github-lexers liluo/pygments-github-lexers diff --git a/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5-r1.ebuild b/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5-r2.ebuild similarity index 74% rename from dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5-r1.ebuild rename to dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5-r2.ebuild index c367787797d7e..dba3d03278671 100644 --- a/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5-r1.ebuild +++ b/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 @@ -14,7 +14,6 @@ SRC_URI="https://github.com/liluo/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" dev-python/pygments[${PYTHON_USEDEP}] @@ -23,4 +22,8 @@ BDEPEND=" ${RDEPEND} " +PATCHES=( + "${FILESDIR}/pygments-github-lexers-0.0.5-escape-sequences.patch" +) + # no tests