commit: 486c55ba97a201f95a09739806289129a076eb88 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Tue Jul 30 08:26:34 2024 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Tue Jul 30 08:48:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=486c55ba
dev-vcs/gitstats: Support python 3.12 Thanks-to: Khumba Closes: https://bugs.gentoo.org/929561 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> .../files/gitstats-0_pre20201124-py312.patch | 44 ++++++++++++++++++++++ dev-vcs/gitstats/gitstats-0_pre20201124.ebuild | 9 +++-- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dev-vcs/gitstats/files/gitstats-0_pre20201124-py312.patch b/dev-vcs/gitstats/files/gitstats-0_pre20201124-py312.patch new file mode 100644 index 000000000000..3896fd87e937 --- /dev/null +++ b/dev-vcs/gitstats/files/gitstats-0_pre20201124-py312.patch @@ -0,0 +1,44 @@ +From 4743c3fe184ce6e10d145c536af5b3689b069fc2 Mon Sep 17 00:00:00 2001 +From: Bryan Gardiner <[email protected]> +Date: Fri, 14 Jun 2024 19:13:32 -0700 +Subject: [PATCH] Use raw strings for regexs to fix new SyntaxWarnings in + Python 3.12. + +--- + gitstats | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gitstats b/gitstats +index 9f14a0f..37005f3 100755 +--- a/gitstats ++++ b/gitstats +@@ -96,7 +96,7 @@ def getkeyssortedbyvaluekey(d, key): + return [el[1] for el in sorted([(d[el][key], el) for el in list(d.keys())])] + + def getstatsummarycounts(line): +- numbers = re.findall('\d+', line) ++ numbers = re.findall(r'\d+', line) + if len(numbers) == 1: + # neither insertions nor deletions: may probably only happen for "0 files changed" + numbers.append(0); +@@ -322,7 +322,7 @@ class GitDataCollector(DataCollector): + continue + prev = tag + for line in output.split('\n'): +- parts = re.split('\s+', line, 2) ++ parts = re.split(r'\s+', line, 2) + commits = int(parts[1]) + author = parts[2] + self.tags[tag]['commits'] += commits +@@ -485,7 +485,7 @@ class GitDataCollector(DataCollector): + for line in lines: + if len(line) == 0: + continue +- parts = re.split('\s+', line, 4) ++ parts = re.split(r'\s+', line, 4) + if parts[0] == '160000' and parts[3] == '-': + # skip submodules + continue +-- +2.44.2 + diff --git a/dev-vcs/gitstats/gitstats-0_pre20201124.ebuild b/dev-vcs/gitstats/gitstats-0_pre20201124.ebuild index 9dfd0467a905..ce08093e401a 100644 --- a/dev-vcs/gitstats/gitstats-0_pre20201124.ebuild +++ b/dev-vcs/gitstats/gitstats-0_pre20201124.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-r1 @@ -30,9 +30,12 @@ BDEPEND=" DOCS=( doc/{AUTHOR,README,TODO.txt} ) src_prepare() { + eapply "${FILESDIR}/${P}-py312.patch" + sed \ -e "s:basedirs = \[binarypath, secondarypath, '/usr/share/gitstats'\]:basedirs = \['${EPREFIX}/usr/share/gitstats'\]:g" \ -i gitstats || die "failed to fix static files path" + default }
