config with default template 2.5.1

.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] }}

.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" = ["*"]}

.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

news/+meta.internal

@@ -0,0 +1,2 @@
+Update configuration files.
+[plone devs]

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:

setup.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 from setuptools import setup
 
-
 version = "6.0.0a2.dev0"
 
 long_description = (

src/plone/outputfilters/filters/picture_variants.py

@@ -7,7 +7,6 @@
 
 import logging
 
-
 logger = logging.getLogger("plone.outputfilter.picture_variants")
 
 

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/([^/]*)/?(.*)$")
 

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
 )

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__))
 
 
@@ -156,9 +155,7 @@ def test_parsing_long_doc(self):
 </ul>
 <p>Thanks for using our product; we hope you like it!</p>
 <p>—The Plone Team</p>
-        """.format(
-            uid=self.UID
-        )
+        """.format(uid=self.UID)
         import time
 
         startTime = time.time()
@@ -232,17 +229,13 @@ def test_parsing_long_doc(self):
 </ul>
 <p>Thanks for using our product; we hope you like it!</p>
 <p>—The Plone Team</p>
-        """.format(
-            uid=self.UID
-        )
+        """.format(uid=self.UID)
         self._assertTransformsTo(text, text_out)
 
     def test_parsing_with_nonexisting_srcset(self):
         text = """
 <p><img class="image-richtext image-inline image-size-thumb" src="resolveuid/{uid}/@@images/image/thumb" alt="" data-linktype="image" data-picturevariant="thumb" data-scale="thumb" data-val="{uid}" /></p>
-        """.format(
-            uid=self.UID
-        )
+        """.format(uid=self.UID)
         res = self.parser(text)
         self.assertTrue(res)
         # verify that tag was not converted:

src/plone/outputfilters/tests/test_resolveuid_and_caption.py

@@ -18,7 +18,6 @@
 
 import warnings
 
-
 PREFIX = abspath(dirname(__file__))
 
 
@@ -178,9 +177,7 @@ def test_parsing_long_doc(self):
 </ul>
 <p>Thanks for using our product; we hope you like it!</p>
 <p>—The Plone Team</p>
-        """.format(
-            uid=self.UID
-        )
+        """.format(uid=self.UID)
         import time
 
         startTime = time.time()
@@ -263,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 = (
-            """<map id="the_map" name="the_map">
+        text_in = """<map id="the_map" name="the_map">
 <area alt="alpha" href="resolveuid/%s" coords="1,2,3,4" shape="rect" />
-</map>"""
-            % self.UID
-        )
+</map>""" % self.UID
         text_out = """<map id="the_map" name="the_map">
 <area alt="alpha" coords="1,2,3,4" href="http://nohost/plone/image.jpg" shape="rect"/>
 </map>"""

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