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 4A944158089 for ; Fri, 20 Oct 2023 14:49:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E2C32BC069; Fri, 20 Oct 2023 14:49:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61FAA2BC069 for ; Fri, 20 Oct 2023 14:49:58 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3BD19335CB9 for ; Fri, 20 Oct 2023 14:49:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D5C5D1297 for ; Fri, 20 Oct 2023 14:49:55 +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: <1697813347.b56e983bb5e2ac6565938332d27c865dfc75b8e3.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/zconfig/, dev-python/zconfig/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/zconfig/files/zconfig-4.0-py312.patch dev-python/zconfig/zconfig-4.0.ebuild X-VCS-Directories: dev-python/zconfig/files/ dev-python/zconfig/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b56e983bb5e2ac6565938332d27c865dfc75b8e3 X-VCS-Branch: master Date: Fri, 20 Oct 2023 14:49:55 +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: 873c64e9-b9bc-491e-8832-1ab9f415a9a5 X-Archives-Hash: 4c7c62a2c57fe7d203e42c85fa3398fc commit: b56e983bb5e2ac6565938332d27c865dfc75b8e3 Author: Michał Górny gentoo org> AuthorDate: Fri Oct 20 14:49:07 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Oct 20 14:49:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b56e983b dev-python/zconfig: Enable py3.12 Signed-off-by: Michał Górny gentoo.org> dev-python/zconfig/files/zconfig-4.0-py312.patch | 37 ++++++++++++++++++++++++ dev-python/zconfig/zconfig-4.0.ebuild | 12 ++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dev-python/zconfig/files/zconfig-4.0-py312.patch b/dev-python/zconfig/files/zconfig-4.0-py312.patch new file mode 100644 index 000000000000..6f8c53ed18a0 --- /dev/null +++ b/dev-python/zconfig/files/zconfig-4.0-py312.patch @@ -0,0 +1,37 @@ +From 390ce89cfd4bf1a60d8d67ee20106288cbfa0e51 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Van=C4=9Bk?= +Date: Fri, 23 Jun 2023 08:10:09 +0200 +Subject: [PATCH] Fix tests for Python 3.12 (#91) + +In the tests, remove the assertRaisesRegexp method, deprecated since +Python 3.2, to prevent test failures following the method's removal in +Python 3.12. +--- + src/ZConfig/tests/support.py | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/src/ZConfig/tests/support.py b/src/ZConfig/tests/support.py +index 959f2b9..559c015 100644 +--- a/src/ZConfig/tests/support.py ++++ b/src/ZConfig/tests/support.py +@@ -17,7 +17,6 @@ + import contextlib + import os + import sys +-import unittest + from io import StringIO + from urllib.request import pathname2url + +@@ -79,12 +78,6 @@ def f2(self): + class TestHelper: + """Utility methods which can be used with the schema support.""" + +- # Not derived from unittest.TestCase; some test runners seem to +- # think that means this class contains tests. +- +- assertRaisesRegex = getattr(unittest.TestCase, 'assertRaisesRegex', +- unittest.TestCase.assertRaisesRegexp) +- + def load_both(self, schema_url, conf_url): + schema = self.load_schema(schema_url) + conf = self.load_config(schema, conf_url) diff --git a/dev-python/zconfig/zconfig-4.0.ebuild b/dev-python/zconfig/zconfig-4.0.ebuild index d015ceef4469..297324eb085e 100644 --- a/dev-python/zconfig/zconfig-4.0.ebuild +++ b/dev-python/zconfig/zconfig-4.0.ebuild @@ -6,12 +6,15 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 PYPI_PN="ZConfig" -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 pypi DESCRIPTION="Configuration library supporting a hierarchical schema-driven model" -HOMEPAGE="https://pypi.org/project/ZConfig/" +HOMEPAGE=" + https://github.com/zopefoundation/ZConfig/ + https://pypi.org/project/ZConfig/ +" LICENSE="ZPL" SLOT="0" @@ -32,6 +35,11 @@ distutils_enable_tests unittest distutils_enable_sphinx docs \ dev-python/sphinxcontrib-programoutput +PATCHES=( + # https://github.com/zopefoundation/ZConfig/commit/390ce89cfd4bf1a60d8d67ee20106288cbfa0e51 + "${FILESDIR}/${P}-py312.patch" +) + python_test() { eunittest -s src/ZConfig/tests }