Switch to PEP 420 native namespace. (#344)

* Bumped version for breaking release.

* Replace ``pkg_resources`` namespace with PEP 420 native namespace.

* Update to native namespace.

Need to change tests because of changed discover path.
(Using only `src` as before did not run any tests.
 discover does not seem to support PEP-420 namespace packages very well. :-(
)

* Configuring for c-code

* Switch back to original interface paths.

Author: icemac

.github/workflows/tests.yml

@@ -341,10 +341,10 @@ jobs:
       - name: Run tests with C extensions
         if: ${{ !startsWith(matrix.python-version, 'pypy') }}
         run: |
-          coverage run -p -m unittest discover -s src
+          coverage run -p -m unittest discover -s src/zope
       - name: Run tests without C extensions
         run: |
-          coverage run -p -m unittest discover -s src
+          coverage run -p -m unittest discover -s src/zope
         env:
           PURE_PYTHON: 1
       - name: Report Coverage

.meta.toml

@@ -16,7 +16,7 @@ with-macos = false
 use-flake8 = true
 testenv-commands = [
     "pip install -U -e .[test]",
-    "coverage run -p -m unittest discover -s src {posargs}",
+    "coverage run -p -m unittest discover -s src/zope {posargs}",
     ]
 testenv-setenv = [
     "ZOPE_INTERFACE_STRICT_IRO=1",
@@ -61,6 +61,9 @@ additional-ignores = [
     "docs/_build/html/_static/scripts/*",
     ]
 
+[coverage-run]
+source = "src/zope"
+
 [github-actions]
 additional-install = [
     "- name: Install zope.interface",
@@ -79,10 +82,10 @@ additional-install = [
     "- name: Run tests with C extensions",
     "  if: ${{ !startsWith(matrix.python-version, 'pypy') }}",
     "  run: |",
-    "    coverage run -p -m unittest discover -s src",
+    "    coverage run -p -m unittest discover -s src/zope",
     "- name: Run tests without C extensions",
     "  run: |",
-    "    coverage run -p -m unittest discover -s src",
+    "    coverage run -p -m unittest discover -s src/zope",
     "  env:",
     "    PURE_PYTHON: 1",
     "- name: Report Coverage",

CHANGES.rst

@@ -2,9 +2,11 @@
  Changes
 =========
 
-7.3 (unreleased)
+8.0 (unreleased)
 ================
 
+- Replace ``pkg_resources`` namespace with PEP 420 native namespace.
+
 - Drop support for Python 3.8.
 
 - Allow using newer ``setuptools`` version.

pyproject.toml

@@ -1,4 +1,3 @@
-# 
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/c-code
 
@@ -11,7 +10,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.coverage.run]
 branch = true
-source = ["zope.interface"]
+source = ["src/zope"]
 relative_files = true
 
 [tool.coverage.report]

setup.py

@@ -26,12 +26,11 @@
 from distutils.errors import DistutilsPlatformError
 
 from setuptools import Extension
-from setuptools import find_packages
 from setuptools import setup
 from setuptools.command.build_ext import build_ext
 
 
-version = '7.3.dev0'
+version = '8.0.dev0'
 
 
 class optional_build_ext(build_ext):
@@ -128,9 +127,10 @@ def read(*rnames):
         "Framework :: Zope :: 3",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
-    packages=find_packages('src'),
+    # we need the following two parameters because we compile C code,
+    # otherwise only the shared library is installed:
     package_dir={'': 'src'},
-    namespace_packages=["zope"],
+    packages=['zope.interface', 'zope.interface.common'],
     cmdclass={
         'build_ext': optional_build_ext,
     },