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

PEP 420 native namespace

Author: mauritsvanrees

.github/workflows/test-matrix.yml

@@ -19,7 +19,7 @@ jobs:
         - ["ubuntu", "ubuntu-latest"]
         config:
         # [Python version, visual name, tox env]
-        - ["3.12", "6.2 on py3.12", "py312-plone62"]
+        - ["3.13", "6.2 on py3.13", "py313-plone62"]
         - ["3.10", "6.2 on py3.10", "py310-plone62"]
 
     runs-on: ${{ matrix.os[1] }}

.meta.toml

@@ -3,7 +3,7 @@
 # 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.2"
 
 [flake8]
 extra_lines = """
@@ -33,7 +33,7 @@ dependencies_mappings = [
 ]
 
 [tox]
-test_matrix = {"6.2" = ["3.12", "3.10"]}
+test_matrix = {"6.2" = ["*"]}
 
 [github]
 jobs = [
@@ -49,3 +49,4 @@ extra_lines_after_os_dependencies = """
         sudo locale-gen nl_NL@euro
         sudo update-locale
 """
+

.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
@@ -59,15 +59,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,5 +1,4 @@
 from pathlib import Path
-from setuptools import find_packages
 from setuptools import setup
 
 
@@ -19,7 +18,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)",
@@ -48,9 +47,6 @@
         "Videos": "https://youtube.com/@plonecms",
         "Sponsor": "https://github.com/sponsors/plone",
     },
-    packages=find_packages("src"),
-    namespace_packages=["Products"],
-    package_dir={"": "src"},
     include_package_data=True,
     zip_safe=False,
     install_requires=[
@@ -122,7 +118,6 @@
         "Products.SiteErrorLog",
         "Products.statusmessages",
         "Products.ZCatalog",
-        "setuptools>=36.2",
         "webresource>=1.2",
         "z3c.caching",
         "z3c.form",

src/Products/__init__.py

@@ -7,7 +7,9 @@ min_version = 4.4.0
 envlist =
     lint
     test
+    py313-plone62
     py312-plone62
+    py311-plone62
     py310-plone62
     dependencies
 
@@ -190,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
@@ -221,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'