Merge pull request #41 from plone/config-with-default-template-2.5.1

gforcada · web-flow · commit b2aabce0110a · 2026-03-10T20:07:50.000+01:00
config with default template 2.5.1

[ci-skip]
diff --git 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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+Update configuration files.
+[plone devs]
diff --git 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/setup.py b/setup.py
@@ -1,7 +1,6 @@
 from pathlib import Path
 from setuptools import setup
 
-
 version = "3.0.0a2.dev0"
 
 long_description = (
diff --git a/src/plone/caching/hooks.py b/src/plone/caching/hooks.py
@@ -14,7 +14,6 @@
 
 import logging
 
-
 logger = logging.getLogger("plone.caching")
 
 
diff --git a/src/plone/caching/interfaces.py b/src/plone/caching/interfaces.py
@@ -3,7 +3,6 @@
 
 import zope.i18nmessageid
 
-
 _ = zope.i18nmessageid.MessageFactory("plone")
 
 X_CACHE_RULE_HEADER = "X-Cache-Rule"
diff --git a/src/plone/caching/tests/test_operations.py b/src/plone/caching/tests/test_operations.py
@@ -13,7 +13,6 @@
 
 import unittest
 
-
 _marker = object()
 
 
diff --git a/src/plone/caching/tests/test_utils.py b/src/plone/caching/tests/test_utils.py
@@ -13,7 +13,6 @@
 import unittest
 import zope.component.testing
 
-
 _marker = object()
 
 
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Update configuration files.`
	`2`	`+[plone devs]`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`
`15`	`15`	`import logging`
`16`	`16`
`17`		`-`
`18`	`17`	`logger = logging.getLogger("plone.caching")`
`19`	`18`
`20`	`19`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`
`14`	`14`	`import unittest`
`15`	`15`
`16`		`-`
`17`	`16`	`_marker = object()`
`18`	`17`
`19`	`18`