From 9cd8e770143b76e9b4a706a3e648976481d93105 Mon Sep 17 00:00:00 2001
From: Jens Vagelpohl <jens@plyp.com>
Date: Thu, 14 Mar 2024 08:31:16 +0100
Subject: [PATCH] - Switch to PEP 420 implicit namespace support

---
 .github/workflows/tests.yml    | 6 +++---
 .meta.toml                     | 2 +-
 CHANGES.rst                    | 2 ++
 setup.cfg                      | 2 --
 setup.py                       | 4 +---
 src/dataflake/__init__.py      | 1 -
 src/dataflake/wsgi/__init__.py | 1 -
 tox.ini                        | 2 +-
 8 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 src/dataflake/__init__.py
 delete mode 100644 src/dataflake/wsgi/__init__.py

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 15d6aaf..01713c5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -35,13 +35,13 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: ${{ matrix.config[1] }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.config[0] }}
     - name: Pip cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
diff --git a/.meta.toml b/.meta.toml
index c6b9441..18fffba 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
 [meta]
 template = "zope-product"
-commit-id = "acd8d239"
+commit-id = "1351c95d"
 
 [python]
 with-windows = false
diff --git a/CHANGES.rst b/CHANGES.rst
index ec7b90b..beae4de 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,8 @@ Changelog
 2.2 (unreleased)
 ----------------
 
+- Switch to PEP 420 implicit namespace support.
+
 
 2.1 (2024-01-03)
 ----------------
diff --git a/setup.cfg b/setup.cfg
index 26f5bc7..513e563 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,5 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
-[bdist_wheel]
-universal = 0
 
 [flake8]
 doctests = 1
diff --git a/setup.py b/setup.py
index 1dcb940..b844e32 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,6 @@
 ##############################################################################
 import os
 
-from setuptools import find_packages
 from setuptools import setup
 
 
@@ -37,9 +36,8 @@ def read(*rnames):
     author='Jens Vagelpohl and Contributors',
     author_email='jens@dataflake.org',
     long_description=(read('README.rst') + '\n\n' + read('CHANGES.rst')),
-    packages=find_packages('src'),
+    packages=['dataflake.wsgi.cheroot'],
     package_dir={'': 'src'},
-    namespace_packages=['dataflake', 'dataflake.wsgi'],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
diff --git a/src/dataflake/__init__.py b/src/dataflake/__init__.py
deleted file mode 100644
index de40ea7..0000000
--- a/src/dataflake/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
diff --git a/src/dataflake/wsgi/__init__.py b/src/dataflake/wsgi/__init__.py
deleted file mode 100644
index de40ea7..0000000
--- a/src/dataflake/wsgi/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)
diff --git a/tox.ini b/tox.ini
index d55cb28..71b8215 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,7 +39,7 @@ deps =
 commands_pre =
 commands =
     check-manifest
-    check-python-versions
+    check-python-versions --only setup.py,tox.ini,.github/workflows/tests.yml
     python -m build --sdist --no-isolation
     twine check dist/*