* [gentoo-commits] repo/gentoo:master commit in: dev-python/zope-exceptions/files/, dev-python/zope-exceptions/
@ 2022-04-09 19:12 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2022-04-09 19:12 UTC (permalink / raw
To: gentoo-commits
commit: 5e2ab5ec8ceda7d012ee4f67549783696257cfa3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 19:08:25 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 19:08:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e2ab5ec
dev-python/zope-exceptions: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/zope-exceptions/Manifest | 1 -
.../zope-exceptions-4.4-fix-test-py3.10.patch | 23 -------------
.../zope-exceptions/zope-exceptions-4.4.ebuild | 38 ----------------------
3 files changed, 62 deletions(-)
diff --git a/dev-python/zope-exceptions/Manifest b/dev-python/zope-exceptions/Manifest
index 67261529a5bd..d3cc351c6b45 100644
--- a/dev-python/zope-exceptions/Manifest
+++ b/dev-python/zope-exceptions/Manifest
@@ -1,2 +1 @@
-DIST zope.exceptions-4.4.tar.gz 28243 BLAKE2B 9af0b99826d574218c149c5a378886d3b3ec16935c0b6b883c0e048b22ba5ffee8408597f612a668eb18fc855a236e3810d6320c984faca4b7c5dfb4c76b303b SHA512 6ef175271ad1d62b450533e4c7d8f7380ffac519be5c48be084be297ad21d21fd8be380d9b5e221a8dac6a4c792bab14abc707331415c2df88208cac9c34013e
DIST zope.exceptions-4.5.tar.gz 29609 BLAKE2B 63c853105d3a588418f79e877aeedf0b001bbe52eb3e6c82687127a8cc0b8e424143e75c7a77b224ede31c5db0efb1bbc126e851dbc8bef5b856615b0717f6ea SHA512 f3f75b2f9ecfe74d3bb081904750769bf331fb594d266907782b7ce7f9d062c261b2f95a50ce21cf8917c56a25899274dae466a5b59afa5ec66480182df55bd2
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
deleted file mode 100644
index a218797b25a2..000000000000
--- a/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index e3e9b985874f..000000000000
--- a/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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..10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-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"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/zope-testrunner[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-test-py3.10.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_install_all() {
- distutils-r1_python_install_all
-
- # remove .pth files since dev-python/namespace-zope handles the ns
- find "${D}" -name '*.pth' -delete || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/zope-exceptions/files/, dev-python/zope-exceptions/
@ 2024-06-18 15:56 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2024-06-18 15:56 UTC (permalink / raw
To: gentoo-commits
commit: 2d5675d34636ba74a57afcb5e58d4fc112534ef8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 18 15:21:50 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 15:56:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d5675d3
dev-python/zope-exceptions: Enable py3.13
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/zope-exceptions-5.1-py313.patch | 24 ++++++++++++++++++++++
.../zope-exceptions/zope-exceptions-5.1.ebuild | 7 ++++++-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/dev-python/zope-exceptions/files/zope-exceptions-5.1-py313.patch b/dev-python/zope-exceptions/files/zope-exceptions-5.1-py313.patch
new file mode 100644
index 000000000000..623b53b32376
--- /dev/null
+++ b/dev-python/zope-exceptions/files/zope-exceptions-5.1-py313.patch
@@ -0,0 +1,24 @@
+diff --git a/src/zope/exceptions/tests/test_exceptionformatter.py b/src/zope/exceptions/tests/test_exceptionformatter.py
+index 92ea79a..0e18d8d 100644
+--- a/src/zope/exceptions/tests/test_exceptionformatter.py
++++ b/src/zope/exceptions/tests/test_exceptionformatter.py
+@@ -24,6 +24,7 @@ from urllib.error import HTTPError
+
+
+ IS_PY39_OR_GREATER = sys.version_info >= (3, 9)
++IS_PY313_OR_GREATER = sys.version_info >= (3, 13)
+
+
+ class TextExceptionFormatterTests(unittest.TestCase):
+@@ -763,8 +764,10 @@ class Test_format_exception(unittest.TestCase):
+ </ul><p> File "<string>", line 1<br />
+ import<br />
+ ^<br />
+- SyntaxError: invalid syntax<br />
++ SyntaxError: {error}<br />
+ </p>""").format(
++ error="Expected one or more names after 'import'"
++ if IS_PY313_OR_GREATER else 'invalid syntax',
+ module='zope.exceptions.tests.test_exceptionformatter',
+ fn='test_format_exception_as_html',
+ )
diff --git a/dev-python/zope-exceptions/zope-exceptions-5.1.ebuild b/dev-python/zope-exceptions/zope-exceptions-5.1.ebuild
index 7bf7eb05d7af..956910d21e15 100644
--- a/dev-python/zope-exceptions/zope-exceptions-5.1.ebuild
+++ b/dev-python/zope-exceptions/zope-exceptions-5.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
inherit distutils-r1 pypi
@@ -28,6 +28,11 @@ RDEPEND="
distutils_enable_tests unittest
src_prepare() {
+ local PATCHES=(
+ # https://github.com/zopefoundation/zope.exceptions/issues/34
+ "${FILESDIR}/${P}-py313.patch"
+ )
+
# strip rdep specific to namespaces
sed -i -e "/'setuptools'/d" setup.py || die
distutils-r1_src_prepare
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-18 15:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-09 19:12 [gentoo-commits] repo/gentoo:master commit in: dev-python/zope-exceptions/files/, dev-python/zope-exceptions/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-06-18 15:56 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox