commit: 7072359f04cb45dba80a39ea9e179299fd9df55a Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Sep 13 05:32:26 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Sep 13 06:05:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7072359f
dev-python/zope-testing: Bump to 6.0 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/zope-testing/Manifest | 1 + .../zope-testing/files/zope-testing-6.0-test.patch | 52 ++++++++++++++++++++ dev-python/zope-testing/zope-testing-6.0.ebuild | 55 ++++++++++++++++++++++ 3 files changed, 108 insertions(+) diff --git a/dev-python/zope-testing/Manifest b/dev-python/zope-testing/Manifest index f49be8dc018a..3a66e5817011 100644 --- a/dev-python/zope-testing/Manifest +++ b/dev-python/zope-testing/Manifest @@ -1 +1,2 @@ DIST zope_testing-5.1.tar.gz 42344 BLAKE2B 5a4ca515dcdc80331ddfb731ea0152e4f1746aa6c097415bdc238d4d330523960aa211ffadf5eb76b85b483a21ee1d28da7b0068f05c9c202a3aeca4af61bc80 SHA512 e45053b2e3a8b3ecbe54bc18f1b6f4c274177aaaebd1385eac979bb245c8c25e8db28cb111d1d1a363bf9e2a153df97824074168a39b6c371ed6f68d902b40d2 +DIST zope_testing-6.0.tar.gz 42462 BLAKE2B 8ea0b46417d1227a5a13fd782ebbd497dc208441ebb224d621c560d658dff50e3af74175cb4b339c5c53cb14c9e5a99146b1aa262488380429ed2c3269a372c4 SHA512 a2fe987a308075e611d585e3cba1d62ada883be2e44fccb59fbd4aa04095dd1774f8589f7a2f76211ffe3058da01799e105c53a7fe9d1bbba0bf88e85b85587a diff --git a/dev-python/zope-testing/files/zope-testing-6.0-test.patch b/dev-python/zope-testing/files/zope-testing-6.0-test.patch new file mode 100644 index 000000000000..04767ac8e3f4 --- /dev/null +++ b/dev-python/zope-testing/files/zope-testing-6.0-test.patch @@ -0,0 +1,52 @@ +From da6818492f66cb0512a2de69f1fdb15de0d07ed2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> +Date: Sat, 13 Sep 2025 07:51:46 +0200 +Subject: [PATCH] Use a more unique name for fake module doctests +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Change the tested "fake" module name from `fake` to `__fake__` to reduce +the risk of collisions with real modules. This fixes test failures +when the package is tested in a system environment where `fake.py` +package is installed. + +Signed-off-by: Michał Górny <[email protected]> +--- + src/zope/testing/module.txt | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/zope/testing/module.txt b/src/zope/testing/module.txt +index 6134ca2..555b526 100644 +--- a/src/zope/testing/module.txt ++++ b/src/zope/testing/module.txt +@@ -68,13 +68,13 @@ Importing + Let's now imagine a more complicated example, were we actually want to + be able to import the fake module as well: + +- >>> setUp(test, 'fake') ++ >>> setUp(test, '__fake__') + >>> a = 'Hello world' + + The import should not fail: + +- >>> import fake +- >>> fake.a ++ >>> import __fake__ ++ >>> __fake__.a + 'Hello world' + + Let's tear it down again: +@@ -87,10 +87,10 @@ Let's tear it down again: + .. doctest:: + :pyversion: < 3 + +- >>> import fake ++ >>> import __fake__ + Traceback (most recent call last): + ... +- ModuleNotFoundError: No module named 'fake' ++ ModuleNotFoundError: No module named '__fake__' + + If we enter a dotted name, it will actually try to place the fake + module in that dotted name: diff --git a/dev-python/zope-testing/zope-testing-6.0.ebuild b/dev-python/zope-testing/zope-testing-6.0.ebuild new file mode 100644 index 000000000000..7b386c42a276 --- /dev/null +++ b/dev-python/zope-testing/zope-testing-6.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYPI_PN=${PN/-/.} +PYTHON_TESTED=( python3_{11..13} python3_13t pypy3_11 ) +# py3.14 seems to have had some doctest changes recently +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_14{,t} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Zope testing helpers" +HOMEPAGE=" + https://pypi.org/project/zope.testing/ + https://github.com/zopefoundation/zope.testing/ +" + +LICENSE="ZPL" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +distutils_enable_tests unittest + +src_prepare() { + local PATCHES=( + # https://github.com/zopefoundation/zope.testing/pull/54 + "${FILESDIR}/${P}-test.patch" + ) + + distutils-r1_src_prepare + + # strip rdep specific to namespaces + # https://github.com/zopefoundation/zope.testing/pull/53 + sed -i -e "/'setuptools'/d" setup.py || die +} + +python_test() { + if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then + einfo "Skipping tests on ${EPYTHON}" + return + fi + + "${EPYTHON}" - <<-EOF || die + import sys + import unittest + + from zope.testing.tests import test_suite + + runner = unittest.TextTestRunner(verbosity=2) + result = runner.run(test_suite()) + sys.exit(0 if result.wasSuccessful() else 1) + EOF +}
