Merge pull request #732 from plone/pep-420-native-namespace

PEP 420 native namespace

Author: mauritsvanrees

.github/workflows/test-matrix.yml

@@ -20,9 +20,7 @@ jobs:
         config:
         # [Python version, visual name, tox env]
         - ["3.13", "6.2 on py3.13", "py313-plone62"]
-        - ["3.12", "6.2 on py3.12", "py312-plone62"]
-        - ["3.13", "6.1 on py3.13", "py313-plone61"]
-        - ["3.10", "6.1 on py3.10", "py310-plone61"]
+        - ["3.10", "6.2 on py3.10", "py310-plone62"]
 
     runs-on: ${{ matrix.os[1] }}
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
@@ -36,6 +34,14 @@ jobs:
       with:
         python-version: ${{ matrix.config[0] }}
         allow-prereleases: true
+
+##
+# Add extra configuration options in .meta.toml:
+#  [github]
+#  extra_lines_after_os_dependencies = """
+#  _your own configuration lines_
+#  """
+##
     - name: Pip cache
       uses: actions/cache@v4
       with:
@@ -55,3 +61,12 @@ jobs:
         if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
     - name: Test
       run: tox -e ${{ matrix.config[2] }}
+
+
+##
+# Add extra configuration options in .meta.toml:
+#  [github]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##

.meta.toml

@@ -3,11 +3,11 @@
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "2.0.1.dev0"
+commit-id = "2.2.0"
 
 [pyproject]
 codespell_ignores = "oder,ist,crate"
 dependencies_ignores = "['ZServer', 'plone.app.event', 'Products.CMFPlone',]"
 
 [tox]
-test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["3.13", "3.10"]}
+test_matrix = {"6.2" = ["*"]}

.pre-commit-config.yaml

@@ -7,16 +7,16 @@ ci:
 
 repos:
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.20.0
+    rev: v3.21.0
     hooks:
     -   id: pyupgrade
         args: [--py38-plus]
 -   repo: https://github.com/pycqa/isort
-    rev: 6.0.1
+    rev: 7.0.0
     hooks:
     -   id: isort
--   repo: https://github.com/psf/black
-    rev: 25.1.0
+-   repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 25.9.0
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
@@ -58,15 +58,15 @@ repos:
 #  """
 ##
 -   repo: https://github.com/mgedmin/check-manifest
-    rev: "0.50"
+    rev: "0.51"
     hooks:
     -   id: check-manifest
 -   repo: https://github.com/regebro/pyroma
     rev: "5.0"
     hooks:
     -   id: pyroma
 -   repo: https://github.com/mgedmin/check-python-versions
-    rev: "0.22.1"
+    rev: "0.23.0"
     hooks:
     -   id: check-python-versions
         args: ['--only', 'setup.py,pyproject.toml']

news/3928.breaking

@@ -0,0 +1,2 @@
+Replace ``pkg_resources`` namespace with PEP 420 native namespace.
+Support only Plone 6.2 and Python 3.10+.

setup.py

@@ -1,9 +1,8 @@
 from pathlib import Path
-from setuptools import find_packages
 from setuptools import setup
 
 
-version = "4.0.9.dev0"
+version = "5.0.0.dev0"
 
 long_description = f"""
 {Path("README.rst").read_text()}\n
@@ -20,7 +19,7 @@
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
         "Framework :: Plone",
-        "Framework :: Plone :: 6.1",
+        "Framework :: Plone :: 6.2",
         "Framework :: Plone :: Core",
         "Framework :: Zope :: 5",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
@@ -35,9 +34,6 @@
     author_email="[email protected]",
     url="https://github.com/plone/plone.app.contenttypes",
     license="GPL",
-    packages=find_packages("src"),
-    package_dir={"": "src"},
-    namespace_packages=["plone", "plone.app"],
     include_package_data=True,
     zip_safe=False,
     python_requires=">=3.10",

src/plone/__init__.py

@@ -9,18 +9,19 @@ envlist =
     test
     py313-plone62
     py312-plone62
-    py313-plone61
-    py310-plone61
+    py311-plone62
+    py310-plone62
     dependencies
 
 
 ##
 # Add extra configuration options in .meta.toml:
 # - to specify a custom testing combination of Plone and python versions, use `test_matrix`
+#   Use ["*"] to use all supported Python versions for this Plone version.
 # - to specify extra custom environments, use `envlist_lines`
 # - to specify extra `tox` top-level options, use `config_lines`
 #  [tox]
-#  test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["3.10", "3.9"]}
+#  test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["*"]}
 #  envlist_lines = """
 #      my_other_environment
 #  """
@@ -112,7 +113,6 @@ set_env =
 deps =
     {[test_runner]deps}
     plone62: -c https://dist.plone.org/release/6.2-dev/constraints.txt
-    plone61: -c https://dist.plone.org/release/6.1-dev/constraints.txt
 
 ##
 # Specify additional deps in .meta.toml:
@@ -192,7 +192,6 @@ deps =
     build
     towncrier
     -c https://dist.plone.org/release/6.2-dev/constraints.txt
-
 commands =
     # fake version to not have to install the package
     # we build the change log as news entries might break
@@ -223,7 +222,6 @@ deps =
     pipdeptree
     pipforester
     -c https://dist.plone.org/release/6.2-dev/constraints.txt
-
 commands =
     # Generate the full dependency tree
     sh -c 'pipdeptree -j > forest.json'