diff options
Diffstat (limited to 'dev-python/zope-exceptions')
| -rw-r--r-- | dev-python/zope-exceptions/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch | 23 | ||||
| -rw-r--r-- | dev-python/zope-exceptions/zope-exceptions-4.4.ebuild | 9 |
3 files changed, 31 insertions, 4 deletions
diff --git a/dev-python/zope-exceptions/Manifest b/dev-python/zope-exceptions/Manifest index d83588438dab..23964051691c 100644 --- a/dev-python/zope-exceptions/Manifest +++ b/dev-python/zope-exceptions/Manifest @@ -1,3 +1,4 @@ +AUX zope-exceptions-4.4-fix-test-py3.10.patch 1087 BLAKE2B f5cadad133bde4818e03ac3bf971c093813b3ff48bcde18ad1431038fa8bb1b9b978ffae710d5812c963f0ad6d09f3396b86257e4debd23f3ea293b1eb80ac74 SHA512 681b4aa0d9ae0848ba4101db11942fe8b305aee1941e3c6bbf9c7a4bffe92783eaa1393e9131a25ab1ce7b1f91ca8e0907cbec85e6598907059650314208ca7b DIST zope.exceptions-4.4.tar.gz 28243 BLAKE2B 9af0b99826d574218c149c5a378886d3b3ec16935c0b6b883c0e048b22ba5ffee8408597f612a668eb18fc855a236e3810d6320c984faca4b7c5dfb4c76b303b SHA512 6ef175271ad1d62b450533e4c7d8f7380ffac519be5c48be084be297ad21d21fd8be380d9b5e221a8dac6a4c792bab14abc707331415c2df88208cac9c34013e -EBUILD zope-exceptions-4.4.ebuild 925 BLAKE2B d16e983c9f01d1f44b8628f1e2276abc3ced84def799b18b1638ff71db55b4d077674bb88ba81e87b3cf2290a2b1faba2b82c684fad10593316210accbf4a4f1 SHA512 eeb1b39651165875e94023ab1c1f1b1e68affd3d1e04f862b3643f720e8926854383cfe2ce6e19fcb4080a3e345044d3c3a77407def32050cad50dbc0a1cc480 +EBUILD zope-exceptions-4.4.ebuild 980 BLAKE2B 9182f4b231f3434b4a0ad1c3692cf9eed4d8a3eda7d48ae5ee9e0f9f10b7fa7e29b1881232a7fd73f28dade999b69cfacaf62e7ef834fb32a9b4f5d79cf5f3c1 SHA512 09d62bca36e2db56346327fedbc1b98d50b2eb696dfa89bbec34cfb51183d9dc9288e782038d21aa22cfdbc16898b6458af8fd3c0d4fd061cfea1caa0cb3ffa8 MISC metadata.xml 412 BLAKE2B c10e47865e43c36b30c45f69202df2899e961f2b8ca11c4d6ee289e742cd82ab2708ed91042d042b9b41d977d8b7d13f3d3d1a96fa10a1d6b8beedf52f07ff33 SHA512 184a2a82c735cd77ada2afd4586bd0381c8333bdd604914de8538e941b8c5c2203eeb6c46064e9a41915c316b8399b1ceebcbbfd7f6ab00c480fe44a72726ac2 diff --git a/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch b/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch new file mode 100644 index 000000000000..a218797b25a2 --- /dev/null +++ b/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch @@ -0,0 +1,23 @@ +From 71be9d0724f087c99857edeef514d0b99e429cc9 Mon Sep 17 00:00:00 2001 +From: Zamarin Arthur <arthurzam@gmail.com> +Date: Mon, 31 May 2021 12:14:30 +0300 +Subject: [PATCH] Adapt to python 3.10 SyntaxError messages + +Signed-off-by: Zamarin Arthur <arthurzam@gmail.com> +--- + src/zope/exceptions/tests/test_exceptionformatter.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/zope/exceptions/tests/test_exceptionformatter.py b/src/zope/exceptions/tests/test_exceptionformatter.py +index 64729b1..0f5ee8c 100644 +--- a/src/zope/exceptions/tests/test_exceptionformatter.py ++++ b/src/zope/exceptions/tests/test_exceptionformatter.py +@@ -668,7 +668,7 @@ def test_multiline_exception(self): + self.assertEqual(lines[0], ' syntax error') + # PyPy has a shorter prefix + self.assertTrue(lines[1].endswith(' ^')) +- self.assertEqual(lines[2], 'SyntaxError: invalid syntax') ++ self.assertRegex(lines[2], '^SyntaxError: invalid syntax') + + def test_traceback_info_non_ascii(self): + __traceback_info__ = u"Have a Snowman: \u2603" diff --git a/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild index 61b483dc978a..e3e9b985874f 100644 --- a/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild +++ b/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..9} pypy3 ) +PYTHON_COMPAT=( python3_{7..10} pypy3 ) inherit distutils-r1 @@ -14,6 +14,7 @@ MY_P=${MY_PN}-${PV} DESCRIPTION="General purpose exceptions for Zope packages" HOMEPAGE="https://pypi.org/project/zope.exceptions/ https://github.com/zopefoundation/zope.exceptions" SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="ZPL" SLOT="0" @@ -23,7 +24,9 @@ RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}]" BDEPEND="test? ( dev-python/zope-testrunner[${PYTHON_USEDEP}] )" -S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/${P}-fix-test-py3.10.patch" +) distutils_enable_tests setup.py |