From 71c14137d2dea68be7f5133845f55938a4194629 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Fri, 8 Aug 2025 08:30:07 +0200 Subject: [PATCH 1/3] Bumped version for breaking release. --- CHANGES.rst | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 9f9aec6..fe08403 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,7 +2,7 @@ CHANGES ======= -6.3 (unreleased) +7.0 (unreleased) ---------------- - Nothing changed yet. diff --git a/setup.py b/setup.py index ca31ac3..607be0a 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def read(*rnames): setup(name='zope.untrustedpython', - version='6.3.dev0', + version='7.0.dev0', author='Zope Foundation and Contributors', author_email='zope-dev@zope.dev', description='Zope Untrusted Python Library', From 08472f6a33d0ef5eecafe5363b34172dbf6a4e1d Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Fri, 8 Aug 2025 08:30:12 +0200 Subject: [PATCH 2/3] Replace ``pkg_resources`` namespace with PEP 420 native namespace. --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index fe08403..b16c373 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ CHANGES 7.0 (unreleased) ---------------- -- Nothing changed yet. +- Replace ``pkg_resources`` namespace with PEP 420 native namespace. 6.2 (2025-08-08) From 57457a70e2b656fac8dbbd51aeb6013d37991012 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Fri, 8 Aug 2025 08:30:23 +0200 Subject: [PATCH 3/3] Switch to PEP 420 native namespace. --- setup.py | 4 ---- src/zope/__init__.py | 1 - 2 files changed, 5 deletions(-) delete mode 100644 src/zope/__init__.py diff --git a/setup.py b/setup.py index 607be0a..8a6cfe6 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,6 @@ """ import os -from setuptools import find_packages from setuptools import setup @@ -59,9 +58,6 @@ def read(*rnames): ], url='http://github.com/zopefoundation/zope.untrustedpython', license='ZPL-2.1', - packages=find_packages('src'), - package_dir={'': 'src'}, - namespace_packages=['zope'], python_requires='>=3.9', install_requires=[ 'RestrictedPython >= 4', diff --git a/src/zope/__init__.py b/src/zope/__init__.py deleted file mode 100644 index de40ea7..0000000 --- a/src/zope/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__('pkg_resources').declare_namespace(__name__)