From d6567e2ebb921584007c5f5f584fea77d436fc72 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Wed, 3 Sep 2025 08:29:55 +0200 Subject: [PATCH 1/4] 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 b64089e..200ba0e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,7 +2,7 @@ Changes ========= -6.2 (unreleased) +7.0 (unreleased) ================ - Add preliminary support for Python 3.14. diff --git a/setup.py b/setup.py index 0f3c49c..c77a2a6 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ from setuptools.command.build_ext import build_ext -version = '6.2.dev0' +version = '7.0.dev0' class optional_build_ext(build_ext): From a79ec80db56c560938bfd1e01251be39f61941ac Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Wed, 3 Sep 2025 08:29:58 +0200 Subject: [PATCH 2/4] Replace ``pkg_resources`` namespace with PEP 420 native namespace. --- CHANGES.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 200ba0e..9d0d50a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,8 @@ 7.0 (unreleased) ================ +- Replace ``pkg_resources`` namespace with PEP 420 native namespace. + - Add preliminary support for Python 3.14. - Drop support for Python 3.8. From 42e668188bf0873515740b0b8b3e80c6dfa75a4a Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Wed, 3 Sep 2025 08:31:57 +0200 Subject: [PATCH 3/4] Switch to PEP 420 native namespace. --- setup.py | 5 +---- src/zope/__init__.py | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 src/zope/__init__.py diff --git a/setup.py b/setup.py index c77a2a6..ee0e0c2 100644 --- a/setup.py +++ b/setup.py @@ -117,9 +117,6 @@ def read(*rnames): 'Operating System :: OS Independent', ], keywords='proxy generic transparent', - packages=['zope', 'zope.proxy'], - package_dir={'': 'src'}, - namespace_packages=['zope'], cmdclass={ 'build_ext': optional_build_ext, }, @@ -136,7 +133,7 @@ def read(*rnames): 'test': [ # We have a circular dependency with zope.security for testing 'zope.security >= 7.3', - 'zope.testrunner', + 'zope.testrunner >= 6.4', ], 'docs': [ 'Sphinx', 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__) From e09161d899be86836987a03705d6e2a97e323278 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Wed, 3 Sep 2025 08:32:15 +0200 Subject: [PATCH 4/4] Add packages back. --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py index ee0e0c2..4862ead 100644 --- a/setup.py +++ b/setup.py @@ -117,6 +117,10 @@ def read(*rnames): 'Operating System :: OS Independent', ], keywords='proxy generic transparent', + # we need the following two parameters because we compile C code, + # otherwise only the shared library is installed: + package_dir={'': 'src'}, + packages=['zope.proxy'], cmdclass={ 'build_ext': optional_build_ext, },