From d92a6718650be204083146ac6cdf4462e8427a7a Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Tue, 10 Mar 2026 19:49:54 +0100 Subject: [PATCH 1/3] Configuring with plone.meta --- .github/workflows/test-matrix.yml | 2 +- .meta.toml | 2 +- .pre-commit-config.yaml | 6 +++--- news/+meta.internal | 2 ++ pyproject.toml | 4 ++-- tox.ini | 4 ++++ 6 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 news/+meta.internal diff --git a/.github/workflows/test-matrix.yml b/.github/workflows/test-matrix.yml index 05872b5..8b2da2b 100644 --- a/.github/workflows/test-matrix.yml +++ b/.github/workflows/test-matrix.yml @@ -19,7 +19,7 @@ jobs: - ["ubuntu", "ubuntu-latest"] config: # [Python version, visual name, tox env] - - ["3.13", "6.2 on py3.13", "py313-plone62"] + - ["3.14", "6.2 on py3.14", "py314-plone62"] - ["3.10", "6.2 on py3.10", "py310-plone62"] runs-on: ${{ matrix.os[1] }} diff --git a/.meta.toml b/.meta.toml index 51896f1..eca6b0a 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.2.0" +commit-id = "2.5.1" [tox] test_matrix = {"6.2" = ["*"]} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 26c3c6f..2e8482b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,13 +10,13 @@ repos: rev: v3.21.2 hooks: - id: pyupgrade - args: [--py38-plus] + args: [--py310-plus] - repo: https://github.com/pycqa/isort - rev: 7.0.0 + rev: 8.0.1 hooks: - id: isort - repo: https://github.com/psf/black-pre-commit-mirror - rev: 25.12.0 + rev: 26.1.0 hooks: - id: black - repo: https://github.com/collective/zpretty 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/pyproject.toml b/pyproject.toml index bd1a854..ae71fb8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ # https://github.com/plone/meta/tree/main/src/plone/meta/default # See the inline comments on how to expand/tweak this configuration file [build-system] -requires = ["setuptools>=68.2,<80", "wheel"] +requires = ["setuptools>=68.2,<83", "wheel"] [tool.towncrier] directory = "news/" @@ -60,7 +60,7 @@ profile = "plone" ## [tool.black] -target-version = ["py38"] +target-version = ["py310"] ## # Add extra configuration options in .meta.toml: diff --git a/tox.ini b/tox.ini index 5a21483..fc15d30 100644 --- a/tox.ini +++ b/tox.ini @@ -7,6 +7,7 @@ min_version = 4.4.0 envlist = lint test + py314-plone62 py313-plone62 py312-plone62 py311-plone62 @@ -18,6 +19,7 @@ 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 disable the test matrix entirely, set `use_test_matrix = false` # - to specify extra custom environments, use `envlist_lines` # - to specify extra `tox` top-level options, use `config_lines` # [tox] @@ -62,6 +64,7 @@ description = check if the package defines all its dependencies skip_install = true deps = build + setuptools<82.0.0 z3c.dependencychecker==2.14.3 commands = python -m build --sdist @@ -130,6 +133,7 @@ extras = ## # Add extra configuration options in .meta.toml: # [tox] +# skip_test_extra = true # test_extras = """ # tests # widgets From 3aad085e14523980590156e857143921a1ecfeb9 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Tue, 10 Mar 2026 19:50:08 +0100 Subject: [PATCH 2/3] chore: isort --- setup.py | 1 - src/plone/outputfilters/filters/picture_variants.py | 1 - src/plone/outputfilters/filters/resolveuid_and_caption.py | 1 - src/plone/outputfilters/tests/test_docs.py | 1 - src/plone/outputfilters/tests/test_picture_variants.py | 1 - src/plone/outputfilters/tests/test_resolveuid_and_caption.py | 1 - 6 files changed, 6 deletions(-) diff --git a/setup.py b/setup.py index 3468b7f..a2d4db8 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,6 @@ from pathlib import Path from setuptools import setup - version = "6.0.0a2.dev0" long_description = ( diff --git a/src/plone/outputfilters/filters/picture_variants.py b/src/plone/outputfilters/filters/picture_variants.py index 8718bc7..734d655 100644 --- a/src/plone/outputfilters/filters/picture_variants.py +++ b/src/plone/outputfilters/filters/picture_variants.py @@ -7,7 +7,6 @@ import logging - logger = logging.getLogger("plone.outputfilter.picture_variants") diff --git a/src/plone/outputfilters/filters/resolveuid_and_caption.py b/src/plone/outputfilters/filters/resolveuid_and_caption.py index e957172..30255a2 100644 --- a/src/plone/outputfilters/filters/resolveuid_and_caption.py +++ b/src/plone/outputfilters/filters/resolveuid_and_caption.py @@ -26,7 +26,6 @@ import re - appendix_re = re.compile("^(.*)([?#].*)$") resolveuid_re = re.compile("^[./]*resolve[Uu]id/([^/]*)/?(.*)$") diff --git a/src/plone/outputfilters/tests/test_docs.py b/src/plone/outputfilters/tests/test_docs.py index e8d6406..97085c7 100644 --- a/src/plone/outputfilters/tests/test_docs.py +++ b/src/plone/outputfilters/tests/test_docs.py @@ -5,7 +5,6 @@ import pprint import unittest - optionflags = ( doctest.ELLIPSIS | doctest.NORMALIZE_WHITESPACE | doctest.REPORT_ONLY_FIRST_FAILURE ) diff --git a/src/plone/outputfilters/tests/test_picture_variants.py b/src/plone/outputfilters/tests/test_picture_variants.py index 8e8d074..dd5151e 100644 --- a/src/plone/outputfilters/tests/test_picture_variants.py +++ b/src/plone/outputfilters/tests/test_picture_variants.py @@ -14,7 +14,6 @@ from plone.outputfilters.testing import PLONE_OUTPUTFILTERS_FUNCTIONAL_TESTING from Products.PortalTransforms.tests.utils import normalize_html - PREFIX = abspath(dirname(__file__)) diff --git a/src/plone/outputfilters/tests/test_resolveuid_and_caption.py b/src/plone/outputfilters/tests/test_resolveuid_and_caption.py index 403d3ee..5e8f85e 100644 --- a/src/plone/outputfilters/tests/test_resolveuid_and_caption.py +++ b/src/plone/outputfilters/tests/test_resolveuid_and_caption.py @@ -18,7 +18,6 @@ import warnings - PREFIX = abspath(dirname(__file__)) From 29d5f51071d9a5fc41e2af3a4698e5d638ba980b Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Tue, 10 Mar 2026 19:50:48 +0100 Subject: [PATCH 3/3] chore: black --- .../outputfilters/tests/test_picture_variants.py | 12 +++--------- .../tests/test_resolveuid_and_caption.py | 11 +++-------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/src/plone/outputfilters/tests/test_picture_variants.py b/src/plone/outputfilters/tests/test_picture_variants.py index dd5151e..ea17a11 100644 --- a/src/plone/outputfilters/tests/test_picture_variants.py +++ b/src/plone/outputfilters/tests/test_picture_variants.py @@ -155,9 +155,7 @@ def test_parsing_long_doc(self):

Thanks for using our product; we hope you like it!

—The Plone Team

- """.format( - uid=self.UID - ) + """.format(uid=self.UID) import time startTime = time.time() @@ -231,17 +229,13 @@ def test_parsing_long_doc(self):

Thanks for using our product; we hope you like it!

—The Plone Team

- """.format( - uid=self.UID - ) + """.format(uid=self.UID) self._assertTransformsTo(text, text_out) def test_parsing_with_nonexisting_srcset(self): text = """

- """.format( - uid=self.UID - ) + """.format(uid=self.UID) res = self.parser(text) self.assertTrue(res) # verify that tag was not converted: diff --git a/src/plone/outputfilters/tests/test_resolveuid_and_caption.py b/src/plone/outputfilters/tests/test_resolveuid_and_caption.py index 5e8f85e..d4600f9 100644 --- a/src/plone/outputfilters/tests/test_resolveuid_and_caption.py +++ b/src/plone/outputfilters/tests/test_resolveuid_and_caption.py @@ -177,9 +177,7 @@ def test_parsing_long_doc(self):

Thanks for using our product; we hope you like it!

—The Plone Team

- """.format( - uid=self.UID - ) + """.format(uid=self.UID) import time startTime = time.time() @@ -262,12 +260,9 @@ def test_resolve_uids_fragment(self): self._assertTransformsTo(text_in, text_in) def test_resolve_uids_in_image_maps(self): - text_in = ( - """ + text_in = """ alpha -""" - % self.UID - ) +""" % self.UID text_out = """ alpha """