From abf20e99cdb69062c2074c4c739fd1d0da9b322f Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Fri, 17 Oct 2025 00:38:00 +0300 Subject: [PATCH 1/4] Configuring with plone.meta --- .github/workflows/test-matrix.yml | 17 +++++++++++++++++ .meta.toml | 2 +- news/+meta.internal | 2 ++ tox.ini | 5 ++--- 4 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 news/+meta.internal diff --git a/.github/workflows/test-matrix.yml b/.github/workflows/test-matrix.yml index f96e807..c77efdc 100644 --- a/.github/workflows/test-matrix.yml +++ b/.github/workflows/test-matrix.yml @@ -38,6 +38,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: @@ -57,3 +65,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_ +# """ +## diff --git a/.meta.toml b/.meta.toml index cfecbaa..b0ef179 100644 --- a/.meta.toml +++ b/.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.1.1.dev0" codespell_ignores = "discreet,fo,parms" [flake8] diff --git a/news/+meta.internal b/news/+meta.internal new file mode 100644 index 0000000..c08f539 --- /dev/null +++ b/news/+meta.internal @@ -0,0 +1,2 @@ +Update configuration files. +[plone devs] diff --git a/tox.ini b/tox.ini index 262b589..0c4c642 100644 --- a/tox.ini +++ b/tox.ini @@ -26,10 +26,11 @@ envlist = ## # 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 # """ @@ -200,7 +201,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 @@ -231,7 +231,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' From 30187ce393b61f372a4232752de7ce8e5ba7af64 Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Fri, 17 Oct 2025 00:42:07 +0300 Subject: [PATCH 2/4] Set test matrix to 6.2 only. --- .github/workflows/test-matrix.yml | 4 ---- .meta.toml | 3 +++ tox.ini | 11 ----------- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test-matrix.yml b/.github/workflows/test-matrix.yml index c77efdc..8596af2 100644 --- a/.github/workflows/test-matrix.yml +++ b/.github/workflows/test-matrix.yml @@ -21,10 +21,6 @@ jobs: # [Python version, visual name, tox env] - ["3.13", "6.2 on py3.13", "py313-plone62"] - ["3.10", "6.2 on py3.10", "py310-plone62"] - - ["3.13", "6.1 on py3.13", "py313-plone61"] - - ["3.10", "6.1 on py3.10", "py310-plone61"] - - ["3.9", "6.0 on py3.9", "py39-plone60"] - - ["3.13", "6.0 on py3.13", "py313-plone60"] 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 diff --git a/.meta.toml b/.meta.toml index b0ef179..b37d660 100644 --- a/.meta.toml +++ b/.meta.toml @@ -15,3 +15,6 @@ per-file-ignores = [pyproject] codespell_ignores = "fo,parms" dependencies_ignores = "['plone.portlets',]" + +[tox] +test_matrix = {"6.2" = ["*"]} diff --git a/tox.ini b/tox.ini index 0c4c642..96c73af 100644 --- a/tox.ini +++ b/tox.ini @@ -11,15 +11,6 @@ envlist = py312-plone62 py311-plone62 py310-plone62 - py313-plone61 - py312-plone61 - py311-plone61 - py310-plone61 - py313-plone60 - py312-plone60 - py311-plone60 - py310-plone60 - py39-plone60 dependencies @@ -120,8 +111,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 - plone60: -c https://dist.plone.org/release/6.0-dev/constraints.txt ## # Specify additional deps in .meta.toml: From 5b7c6842fbbd6174b9cfafcd1ef9c0a55b9ef5a9 Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Fri, 17 Oct 2025 01:03:26 +0300 Subject: [PATCH 3/4] Add classifiers --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py index 154c86a..c9a88f4 100644 --- a/setup.py +++ b/setup.py @@ -16,6 +16,8 @@ "Environment :: Web Environment", "Framework :: Plone", "Framework :: Plone :: 6.0", + "Framework :: Plone :: 6.1", + "Framework :: Plone :: 6.2", "Framework :: Plone :: Core", "Framework :: Zope :: 5", "License :: OSI Approved :: BSD License", @@ -25,6 +27,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", ], keywords="zope security CSRF", author="Plone Foundation", From d9ebf289eee9adb91f878faf9ac7b09b329d920b Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Fri, 17 Oct 2025 01:09:27 +0300 Subject: [PATCH 4/4] Switch to PEP 420 native namespace. --- news/3928.breaking | 2 ++ setup.py | 10 +--------- src/plone/__init__.py | 1 - 3 files changed, 3 insertions(+), 10 deletions(-) create mode 100644 news/3928.breaking delete mode 100644 src/plone/__init__.py diff --git a/news/3928.breaking b/news/3928.breaking new file mode 100644 index 0000000..4fb7ad4 --- /dev/null +++ b/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+. diff --git a/setup.py b/setup.py index c9a88f4..090cfbc 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,3 @@ -from setuptools import find_packages from setuptools import setup @@ -15,16 +14,12 @@ "Development Status :: 5 - Production/Stable", "Environment :: Web Environment", "Framework :: Plone", - "Framework :: Plone :: 6.0", - "Framework :: Plone :: 6.1", "Framework :: Plone :: 6.2", "Framework :: Plone :: Core", "Framework :: Zope :: 5", "License :: OSI Approved :: BSD License", "Operating System :: OS Independent", "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", @@ -35,12 +30,9 @@ author_email="plone-developers@lists.sourceforge.net", url="https://github.com/plone/plone.protect", license="BSD", - packages=find_packages("src"), - namespace_packages=["plone"], - package_dir={"": "src"}, include_package_data=True, zip_safe=False, - python_requires=">=3.8", + python_requires=">=3.10", install_requires=[ "collective.monkeypatcher", "lxml[cssselect]", diff --git a/src/plone/__init__.py b/src/plone/__init__.py deleted file mode 100644 index 5284146..0000000 --- a/src/plone/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__("pkg_resources").declare_namespace(__name__)