diff options
Diffstat (limited to 'dev-python/zconfig')
-rw-r--r-- | dev-python/zconfig/Manifest | 3 | ||||
-rw-r--r-- | dev-python/zconfig/files/zconfig-4.0-py312.patch | 37 | ||||
-rw-r--r-- | dev-python/zconfig/zconfig-4.0.ebuild | 12 |
3 files changed, 49 insertions, 3 deletions
diff --git a/dev-python/zconfig/Manifest b/dev-python/zconfig/Manifest index 68b5ba4e8510..43448461be00 100644 --- a/dev-python/zconfig/Manifest +++ b/dev-python/zconfig/Manifest @@ -1,3 +1,4 @@ +AUX zconfig-4.0-py312.patch 1302 BLAKE2B 4489872e08000553dffc603a6f93b7b8abccc6e56f5fb727fbd1c52f71e78c0d93e6d8545acbb86658d2d7781cf677ed25e4e7b541dee46a1571ee20d0003959 SHA512 ea18d730b41765ce0d9585f97923d035bc1f1fe2dd77d4551e33d2923f3c79513b546a6ebc96b944ae1345ff76512d34f089f26bfa353c905bd8d6ce009c39dd DIST ZConfig-4.0.tar.gz 126072 BLAKE2B 7057151267f9b481d3cded72a22dc8fe505f1eac78d156595eb6ba5ff6217b57713ae2ef307358d86320986181bbbb3c1862901297e645bf69dc4893a3e60dbc SHA512 03e3c34f8af9de8bedd98bbdf0c968fdd2fb0c1bb8d62a73c286b804a8841e0e7d9b647f5f3bb37a6d52dc2a5cea7cdce21cd204536399d43203c18e0c204ca7 -EBUILD zconfig-4.0.ebuild 799 BLAKE2B 8bd5884698fde4ff36015ebdc3b7dc236513fa9b5b16d9330a3d16a8b7d5f51089f65ee9ed0517bd5da0246770a046000a095cf480a378652d6cd04520fb9001 SHA512 371cd8be5f3924b9f35216d5a13dbabd94be3f0d2e63ceabe2b80e1daab6b38bc97422d67a82de09d49fc070f8738a6751a6458f113df10b91acdb3498d6fcc0 +EBUILD zconfig-4.0.ebuild 984 BLAKE2B 85642f52eb179c69e2e91202a8191ea332177b8dfa94747ebb3b16770d70c85e3e1e5e3ad0b4ef64e7dbcb6734879fd787af0713c32d1ee116e4f1e9249b9555 SHA512 c06e802880a0ea151537089c492ffd3f61876211d7d0ec9c7f4524ed48f9b272b36effa2e619735fcd618e62aa0daaeac4a7eca8f1075aaf7c06b80991d5f0d9 MISC metadata.xml 1382 BLAKE2B 217d504c7a0eb0298f70194d81723b0dfef3cfd366da12e715ef625f219dea3b29ee230c476c937318c3030912ee5727ae7945f594d088a2fd71aa9f4ccaba81 SHA512 150596d061f8723bcbff7ee7bb67c485a27baa91cce4b505283d7c0d53a59ac0a034d22333e9a4ab98cb1eae076bafce28dd7d24df1b89c2bbcc5cd844db8518 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?= <arkamar@atlas.cz> +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 } |