- Create Zope 5.x branch that uses pkg_resources-style namespaces

Author: dataflake

.github/workflows/tests.yml

@@ -30,7 +30,6 @@ jobs:
         - ["3.11", "py311"]
         - ["3.12", "py312"]
         - ["3.13", "py313"]
-        - ["3.14", "py314"]
         - ["3.11", "docs"]
         - ["3.11", "coverage"]
         exclude:

CHANGES.rst

@@ -1,25 +1,14 @@
 Change log
 ==========
 
-These are all the changes for Zope since the first Zope 5 alpha release.
+These are all the changes for Zope 5 since the first Zope 5 alpha release.
 
 The change log for Zope 4 is at
 https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
 
 
-6.0 (unreleased)
-----------------
-
-- Update to newest compatible versions of dependencies.
-
-
-6.0b1 (2025-11-22)
-------------------
-
-- Replace ``pkg_resources`` namespaces with PEP 420 native namespaces.
-  This change requires using ``zc.buildout`` version 5.
-
-- Drop support for Python 3.9.
+5.14 (unreleased)
+-----------------
 
 - Switch from `z3c.checkversions` to `plone.versioncheck` to detect outdated
   dependency pins as `z3c.checkversions` no longer works and seems abandoned.
@@ -30,6 +19,8 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
 - Enable multipart/form-data and application/x-www-form-urlencoded support
   for PATCH requests.
 
+- Drop support for Python 3.9.
+
 
 5.13 (2025-03-18)
 -----------------

constraints.txt

@@ -15,7 +15,7 @@ MultiMapping==5.0
 Paste==3.10.1
 PasteDeploy==3.1.0
 Persistence==5.4
-Products.BTreeFolder2==6.0
+Products.BTreeFolder2==5.1
 Products.ZCatalog==7.2.1
 Pygments==2.19.2
 Record==4.1
@@ -79,9 +79,9 @@ urllib3==2.5.0
 waitress==3.0.2
 z3c.pt==5.1
 zExceptions==5.0
-zc.lockfile==4.0
-zc.recipe.egg==4.0.0
-zc.recipe.testrunner==4.0
+zc.lockfile==3.0.post1
+zc.recipe.egg==3.0.0
+zc.recipe.testrunner==3.2
 zodbpickle==4.3
 zope.annotation==6.0
 zope.browser==4.0

docs/INSTALL.rst

@@ -12,7 +12,7 @@ available:
 
 - A supported version of Python, including the development support if
   installed from system-level packages.  Supported versions include
-  **3.10** up to **3.14**.
+  **3.10** up to **3.13**.
 
 - Zope needs the Python ``zlib`` module to be importable.  If you are
   building your own Python from source, please be sure that you have the
@@ -57,15 +57,20 @@ steps:
 - Create a buildout configuration file ``buildout.cfg``
 - Run the buildout
 
-The following examples are from Linux and use Zope version 6.0. Just replace
+
+.. note::
+
+    Zope 5 requires using ``zc.buildout`` version 4. Version 5 will not work.
+
+The following examples are from Linux and use Zope version 5.0. Just replace
 that version number with your desired version.
 
 .. code-block:: console
 
     $ python3.13 -m venv zope
     $ cd zope
     <create buildout.cfg in this folder, see examples below>
-    $ bin/pip install -U pip wheel zc.buildout
+    $ bin/pip install -U pip wheel 'zc.buildout<5'
     $ bin/buildout
 
 Using the simplest possible configuration
@@ -77,7 +82,7 @@ built-in ``bin/mkwsgiinstance`` script to create a Zope instance:
 
     [buildout]
     extends =
-        https://zopefoundation.github.io/Zope/releases/6.0/versions-prod.cfg
+        https://zopefoundation.github.io/Zope/releases/5.0/versions-prod.cfg
     parts =
         zopescripts
 
@@ -100,7 +105,7 @@ options, please see the
 
     [buildout]
     extends =
-        https://zopefoundation.github.io/Zope/releases/6.0/versions-prod.cfg
+        https://zopefoundation.github.io/Zope/releases/5.0/versions-prod.cfg
     parts =
         zopeinstance
 
@@ -139,7 +144,7 @@ steps:
 
 - Install Zope and its dependencies
 
-Example steps on Linux. Replace the version number "6.0" with the latest
+Example steps on Linux. Replace the version number "5.0" with the latest
 version you find on https://zopefoundation.github.io/Zope/:
 
 .. code-block:: console
@@ -148,7 +153,7 @@ version you find on https://zopefoundation.github.io/Zope/:
   $ cd zope
   $ bin/pip install -U pip wheel
   $ bin/pip install Zope[wsgi] \
-    -c https://zopefoundation.github.io/Zope/releases/6.0/constraints.txt
+    -c https://zopefoundation.github.io/Zope/releases/5.0/constraints.txt
 
 You can also install Zope using a single requirements file. **Note that this
 installation method might install packages that are not actually needed** (i. e.
@@ -157,21 +162,21 @@ more than are listed in the ``dependencies`` section of ``pyproject.toml``):
 .. code-block:: console
 
     $ bin/pip install \
-    -r https://zopefoundation.github.io/Zope/releases/6.0/requirements-full.txt
+    -r https://zopefoundation.github.io/Zope/releases/5.0/requirements-full.txt
 
 
 Building the documentation
 --------------------------
 You can build the documentation locally. Example steps on Linux. Replace the
-version number "6.0" with the latest version you find on
+version number "5.0" with the latest version you find on
 https://zopefoundation.github.io/Zope/:
 
 .. code-block:: console
 
     $ git clone https://github.com/zopefoundation/Zope.git
     $ cd Zope
     $ python3.13 -m venv .
-    $ bin/pip install -U pip wheel zc.buildout tox
+    $ bin/pip install -U pip wheel 'zc.buildout<5' tox
     $ bin/tox -edocs
 
 The HTML output will be in ``docs/_build/html/``.

docs/news.rst

@@ -15,22 +15,6 @@ supported and for how long.
     :ref:`zope4migration` documentation
 
 
-What's new in Zope 6
---------------------
-
-Added support for newer Python versions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Zope 6.0 and newer support Python 3.14.
-
-Packaging updates
-~~~~~~~~~~~~~~~~~
-
-Zope 6.0 and all dependencies that contain namespace packages have switched
-from the deprecated ``pkg_resources`` style to the newer PEP 420 style
-namespace package configuration.
-
-
 What's new in Zope 5
 --------------------
 

pyproject.toml

@@ -11,7 +11,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "Zope"
-version = "6.0.dev0"
+version = "5.14.dev0"
 description = "Zope application server / web framework"
 readme = "README.rst"
 requires-python = ">=3.10"
@@ -36,7 +36,6 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
-  "Programming Language :: Python :: 3.14",
   "Programming Language :: Python :: Implementation :: CPython",
   "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
   "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",

requirements-full.txt

@@ -32,8 +32,8 @@ transaction==5.0
 waitress==3.0.2
 z3c.pt==5.1
 zExceptions==5.0
-zc.lockfile==4.0
-zc.recipe.egg==4.0.0
+zc.lockfile==3.0.post1
+zc.recipe.egg==3.0.0
 zodbpickle==4.3
 zope.annotation==6.0
 zope.browser==4.0

setup.py

@@ -12,8 +12,12 @@
 #
 ##############################################################################
 
+from setuptools import find_packages
 from setuptools import setup
 
 
 # See pyproject.toml for package metadata
-setup()
+setup(packages=find_packages('src'),
+      namespace_packages=['Products', 'Shared', 'Shared.DC', 'zmi'],
+      package_dir={'': 'src'},
+      )

src/Products/__init__.py

@@ -0,0 +1 @@
+__import__("pkg_resources").declare_namespace(__name__)

src/Shared/DC/__init__.py

@@ -0,0 +1 @@
+__import__("pkg_resources").declare_namespace(__name__)