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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 067BF1382C5 for ; Mon, 31 May 2021 12:09:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2538FE088A; Mon, 31 May 2021 12:09:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9EF3E0885 for ; Mon, 31 May 2021 12:09:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA686340D94 for ; Mon, 31 May 2021 12:09:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D51879E for ; Mon, 31 May 2021 12:09:44 +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: <1622462920.f2cf7a0ba34c05cb2840f2629876da3377ea3cac.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/zope-exceptions/, dev-python/zope-exceptions/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch dev-python/zope-exceptions/zope-exceptions-4.4.ebuild X-VCS-Directories: dev-python/zope-exceptions/files/ dev-python/zope-exceptions/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f2cf7a0ba34c05cb2840f2629876da3377ea3cac X-VCS-Branch: master Date: Mon, 31 May 2021 12:09:44 +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: b36897f9-7de4-4648-8aac-2d99cbf03a57 X-Archives-Hash: 4ea86f70b806164d9f3fbaaa77d8b2b6 commit: f2cf7a0ba34c05cb2840f2629876da3377ea3cac Author: Zamarin Arthur gmail com> AuthorDate: Mon May 31 09:19:00 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon May 31 12:08:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2cf7a0b dev-python/zope-exceptions: bump to python 3.10 fix tests for python3.10 (PR sent upstream) passes tests Signed-off-by: Zamarin Arthur gmail.com> Signed-off-by: Michał Górny gentoo.org> .../zope-exceptions-4.4-fix-test-py3.10.patch | 23 ++++++++++++++++++++++ .../zope-exceptions/zope-exceptions-4.4.ebuild | 9 ++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) 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 00000000000..a218797b25a --- /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 +Date: Mon, 31 May 2021 12:14:30 +0300 +Subject: [PATCH] Adapt to python 3.10 SyntaxError messages + +Signed-off-by: Zamarin Arthur +--- + 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 61b483dc978..e3e9b985874 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