From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 468C61581C1 for ; Wed, 10 Jul 2024 10:53:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A297E29FA; Wed, 10 Jul 2024 10:53:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 608E5E29FA for ; Wed, 10 Jul 2024 10:53:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A10A342FA3 for ; Wed, 10 Jul 2024 10:53:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54EC21E0B for ; Wed, 10 Jul 2024 10:53:10 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1720608784.527964469cc360ae78862df57d6bf1f57d17c9fd.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/tables/files/, dev-python/tables/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/tables/files/tables-3.9.2-py313.patch dev-python/tables/tables-3.9.2-r1.ebuild X-VCS-Directories: dev-python/tables/ dev-python/tables/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 527964469cc360ae78862df57d6bf1f57d17c9fd X-VCS-Branch: master Date: Wed, 10 Jul 2024 10:53:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8ad3664d-7d13-41ca-8cd6-bd438f5d874e X-Archives-Hash: 677648ca3859535369d62a8f6adee5e4 commit: 527964469cc360ae78862df57d6bf1f57d17c9fd Author: Michał Górny gentoo org> AuthorDate: Wed Jul 10 09:52:06 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Jul 10 10:53:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52796446 dev-python/tables: Enable py3.13 Signed-off-by: Michał Górny gentoo.org> dev-python/tables/files/tables-3.9.2-py313.patch | 73 ++++++++++++++++++++++++ dev-python/tables/tables-3.9.2-r1.ebuild | 11 +++- 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/dev-python/tables/files/tables-3.9.2-py313.patch b/dev-python/tables/files/tables-3.9.2-py313.patch new file mode 100644 index 000000000000..660c5615765f --- /dev/null +++ b/dev-python/tables/files/tables-3.9.2-py313.patch @@ -0,0 +1,73 @@ +From 4a1b480e7e3758cf2cf06354ec5720020db16ce7 Mon Sep 17 00:00:00 2001 +From: Antonio Valentino +Date: Sun, 19 May 2024 17:39:47 +0200 +Subject: [PATCH] Fix compatibility with Python v3.13 (Closes: #1166) + +The unittest.makeSuite function is not available in Python 3.13. +--- +diff --git a/tables/tests/test_aux.py b/tables/tests/test_aux.py +index 95f34ee16..cf4f022de 100644 +--- a/tables/tests/test_aux.py ++++ b/tables/tests/test_aux.py +@@ -2,6 +2,7 @@ + import numpy as np + + import tables as tb ++from tables.tests.common import make_suite + + + class TestAuxiliaryFunctions(unittest.TestCase): +diff --git a/tables/nodes/tests/test_filenode.py b/tables/nodes/tests/test_filenode.py +index c2754218a..3572cc38f 100644 +--- a/tables/nodes/tests/test_filenode.py ++++ b/tables/nodes/tests/test_filenode.py +@@ -9,7 +9,7 @@ + from ... import open_file, file, NoSuchNodeError + from ...nodes import filenode + from ...tests.common import ( +- unittest, TempFileMixin, parse_argv, print_versions, ++ unittest, TempFileMixin, parse_argv, print_versions, make_suite, + PyTablesTestCase as TestCase) + + +diff --git a/tables/tests/common.py b/tables/tests/common.py +index 31378a880..918b17247 100644 +--- a/tables/tests/common.py ++++ b/tables/tests/common.py +@@ -366,3 +366,10 @@ def test00(self): + print(f"VmSize: {vmsize:>7} kB\tVmRSS: {vmrss:>7} kB") + print(f"VmData: {vmdata:>7} kB\tVmStk: {vmstk:>7} kB") + print(f"VmExe: {vmexe:>7} kB\tVmLib: {vmlib:>7} kB") ++ ++ ++try: ++ from unittest import makeSuite as make_suite ++except ImportError: ++ def make_suite(test_case_class): ++ return unittest.TestLoader().loadTestsFromTestCase(test_case_class) +From 424784895b0fb15ad06707ce60f9829cef4f11e2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Mon, 3 Jun 2024 17:21:38 +0200 +Subject: [PATCH] Make tables.tests.common.make_suite() accept the prefix + argument + +...as test_queries.py uses it. +--- + tables/tests/common.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/tables/tests/common.py b/tables/tests/common.py +index 918b17247..1d2e5feab 100644 +--- a/tables/tests/common.py ++++ b/tables/tests/common.py +@@ -371,5 +371,8 @@ def test00(self): + try: + from unittest import makeSuite as make_suite + except ImportError: +- def make_suite(test_case_class): +- return unittest.TestLoader().loadTestsFromTestCase(test_case_class) ++ def make_suite(test_case_class, *, prefix=None): ++ loader = unittest.TestLoader() ++ if prefix: ++ loader.testMethodPrefix = prefix ++ return loader.loadTestsFromTestCase(test_case_class) diff --git a/dev-python/tables/tables-3.9.2-r1.ebuild b/dev-python/tables/tables-3.9.2-r1.ebuild index bdbc563361d3..0f77247031d8 100644 --- a/dev-python/tables/tables-3.9.2-r1.ebuild +++ b/dev-python/tables/tables-3.9.2-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..12} ) +PYTHON_COMPAT=( pypy3 python3_{10..13} ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 prefix pypi @@ -52,10 +52,19 @@ python_prepare_all() { local PATCHES=( # https://github.com/PyTables/PyTables/pull/1176 "${FILESDIR}/${P}-numpy-2.patch" + # https://github.com/PyTables/PyTables/commit/4a1b480e7e3758cf2cf06354ec5720020db16ce7 + # https://github.com/PyTables/PyTables/commit/424784895b0fb15ad06707ce60f9829cef4f11e2 + "${FILESDIR}/${P}-py313.patch" ) rm -r c-blosc/{blosc,internal-complibs} || die + # part of https://github.com/PyTables/PyTables/commit/4a1b480e7e3758cf2cf06354ec5720020db16ce7 + # (warning: do it *before* patching, so it doesn't modify + # the added function) + find -name '*.py' -exec \ + sed -i -e 's:unittest[.]makeSuite:make_suite:' {} + || die + distutils-r1_python_prepare_all sed -i -e '/blosc2/d' pyproject.toml || die