Merge pull request #667 from plone/pep-420

PEP 420 namespace packaging and resource updates

Author: petschki

.github/workflows/test-matrix.yml

@@ -20,7 +20,7 @@ jobs:
         config:
         # [Python version, visual name, tox env]
         - ["3.13", "6.2 on py3.13", "py313-plone62"]
-        - ["3.12", "6.1 on py3.12", "py312-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
@@ -34,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@v5
       with:
@@ -53,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,7 +3,7 @@
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "2.1.0"
+commit-id = "2.3.1"
 
 [pyproject]
 codespell_ignores = "foo,bar"
@@ -22,7 +22,7 @@ zpretty_extra_lines = """
 """
 
 [tox]
-test_matrix = {"6.2" = ["3.13"], "6.1" = ["3.12"]}
+test_matrix = {"6.2" = ["*"]}
 
 [github]
 jobs = [

news/+pep420.breaking.md

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

package.json

@@ -5,17 +5,18 @@
     "license": "GPL-2.0-only",
     "dependencies": {
         "@patternslib/patternslib": "^9.10.2",
-        "@plone/mockup": "^5.4.4"
+        "@plone/mockup": "^5.5.0"
     },
     "devDependencies": {
         "@patternslib/dev": "3.8.1",
         "bootstrap": "5.3.8",
         "clean-css-cli": "5.6.3",
         "nodemon": "^3.1.10",
         "npm-run-all": "^4.1.5",
-        "prettier": "3.6.2",
-        "sass": "1.77.8",
-        "sass-loader": "16.0.6"
+        "prettier": "3.6.2"
+    },
+    "resolutions": {
+        "sass": "1.77.8"
     },
     "scripts": {
         "build": "npm-run-all build:webpack build:css",

setup.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from setuptools import find_packages
 from setuptools import setup
 
 
@@ -11,37 +10,32 @@
 setup(
     # metadata in setup.cfg
     name="plone.app.mosaic",
-    version="3.3.3.dev0",
+    version="4.0.0.dev0",
     description="Plone Mosaic Site Builder and Site Layout",
     long_description=long_description,
     long_description_content_type="text/x-rst",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
         "Framework :: Plone",
-        "Framework :: Plone :: 6.0",
-        "Framework :: Plone :: 6.1",
+        "Framework :: Plone :: 6.2",
         "Framework :: Plone :: Addon",
         "Framework :: Zope :: 5",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Operating System :: OS Independent",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
     ],
     keywords="Python Plone javascript mosaic grideditor",
     author="Plone Foundation",
     author_email="foundation@plone.org",
     url="https://github.com/plone/plone.app.mosaic",
-    packages=find_packages("src"),
-    package_dir={"": "src"},
-    namespace_packages=["plone", "plone.app"],
     include_package_data=True,
     zip_safe=False,
-    python_requires=">=3.8",
+    python_requires=">=3.10",
     install_requires=[
         "lxml",
         "plone.api",
@@ -54,7 +48,7 @@
         "plone.app.layout",
         "plone.app.standardtiles",
         "plone.app.tiles",
-        "plone.app.z3cform >= 4.1.0",  # deprecated plone.app.widgets
+        "plone.app.z3cform",
         "plone.autoform",
         "plone.base",
         "plone.dexterity",