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

gforcada · web-flow · commit 39576943ffcb · 2026-03-11T22:31:57.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.3.1"
+commit-id = "2.5.1"
 
 [github]
 jobs = [
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,6 +1,5 @@
 from setuptools import setup
 
-
 version = "4.0.0a2.dev0"
 
 
diff --git a/src/plone/app/standardtiles/__init__.py b/src/plone/app/standardtiles/__init__.py
@@ -1,6 +1,5 @@
 from zope.i18nmessageid import MessageFactory
 
-
 PloneMessageFactory = MessageFactory("plone")
 
 _PMF = PloneMessageFactory
diff --git a/src/plone/app/standardtiles/common.py b/src/plone/app/standardtiles/common.py
@@ -19,7 +19,6 @@
 import Acquisition
 import logging
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/src/plone/app/standardtiles/embed.py b/src/plone/app/standardtiles/embed.py
@@ -6,7 +6,6 @@
 
 import requests
 
-
 NOEMBED_ENDPOINT = "https://noembed.com/embed?url="
 
 
diff --git a/src/plone/app/standardtiles/existingcontent.py b/src/plone/app/standardtiles/existingcontent.py
@@ -26,7 +26,6 @@
 
 import copy
 
-
 try:
     from plone.app.z3cform.widgets.contentbrowser import (
         ContentBrowserFieldWidget as ExistingContentBrowserWidget,
diff --git a/src/plone/app/standardtiles/field.py b/src/plone/app/standardtiles/field.py
@@ -21,7 +21,6 @@
 from zope.interface import Interface
 from zope.pagetemplate.interfaces import IPageTemplate
 
-
 try:
     from plone.app.z3cform.widgets.text import TextAreaWidget
     from plone.app.z3cform.widgets.text import TextWidget
diff --git a/src/plone/app/standardtiles/portlets/add.py b/src/plone/app/standardtiles/portlets/add.py
@@ -18,7 +18,6 @@
 from zope.lifecycleevent import ObjectCreatedEvent
 from zope.traversing.browser.absoluteurl import absoluteURL
 
-
 _ = MessageFactory("plone")
 
 
diff --git a/src/plone/app/standardtiles/portlets/assignment.py b/src/plone/app/standardtiles/portlets/assignment.py
@@ -10,7 +10,6 @@
 from zope.component import adapter
 from zope.interface import implementer
 
-
 # The '+' view of the portlet manager
 # is applied on the assignment not on the manager itself.
 # We need a custom marker interface for the assignment
diff --git a/src/plone/app/standardtiles/portlets/utils.py b/src/plone/app/standardtiles/portlets/utils.py
@@ -6,7 +6,6 @@
 
 import logging
 
-
 logger = logging.getLogger("plone.app.standardtiles")
 
 
diff --git a/src/plone/app/standardtiles/portlets/vocabularies.py b/src/plone/app/standardtiles/portlets/vocabularies.py
@@ -6,7 +6,6 @@
 from zope.schema.vocabulary import SimpleTerm
 from zope.schema.vocabulary import SimpleVocabulary
 
-
 PORTLET_MANAGER = "plone.app.standardtiles.portletManager"
 
 
diff --git a/src/plone/app/standardtiles/rawembed.py b/src/plone/app/standardtiles/rawembed.py
@@ -12,10 +12,8 @@ class IRawEmbedTile(Schema):
 
     tile_title = schema.TextLine(
         title=_("Title"),
-        description=_(
-            """The title will also be used to create
-            identifying class on that tile"""
-        ),
+        description=_("""The title will also be used to create
+            identifying class on that tile"""),
         required=True,
     )
 
@@ -28,10 +26,8 @@ class IRawEmbedTile(Schema):
     ignore_querystring("html_snippet")
     html_snippet = schema.SourceText(
         title=_("HTML Snippet"),
-        description=_(
-            """Be CAREFUL what you paste here, no security
-            checks or transforms to safe_html will be done!"""
-        ),
+        description=_("""Be CAREFUL what you paste here, no security
+            checks or transforms to safe_html will be done!"""),
         required=False,
     )
 
diff --git a/src/plone/app/standardtiles/rss.py b/src/plone/app/standardtiles/rss.py
@@ -10,7 +10,6 @@
 import feedparser
 import time
 
-
 # Accept these bozo_exceptions encountered by feedparser when parsing
 # the feed:
 ACCEPTED_FEEDPARSER_EXCEPTIONS = (feedparser.CharacterEncodingOverride,)
diff --git a/src/plone/app/standardtiles/testing.py b/src/plone/app/standardtiles/testing.py
@@ -28,7 +28,6 @@
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.publisher.interfaces.browser import IBrowserView
 
-
 NORMAL_USER_NAME = "user"
 NORMAL_USER_PASSWORD = "secret"
 EDITOR_USER_NAME = "editor"
diff --git a/src/plone/app/standardtiles/tests/test_media.py b/src/plone/app/standardtiles/tests/test_media.py
@@ -24,7 +24,6 @@
 import transaction
 import unittest
 
-
 try:
     distribution("plone.formwidget.multifile")
 except PackageNotFoundError:
diff --git a/src/plone/app/standardtiles/tests/test_setup.py b/src/plone/app/standardtiles/tests/test_setup.py
@@ -5,7 +5,6 @@
 
 import unittest
 
-
 PROJECTNAME = "plone.app.standardtiles"
 
 
diff --git a/src/plone/app/standardtiles/upgrades.py b/src/plone/app/standardtiles/upgrades.py
@@ -3,7 +3,6 @@
 from Products.CMFCore.utils import getToolByName
 from zope.component import getUtility
 
-
 logger = getLogger(__name__)
 
 
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
`@@ -1,6 +1,5 @@`
`1`	`1`	`from setuptools import setup`
`2`	`2`
`3`		`-`
`4`	`3`	`version = "4.0.0a2.dev0"`
`5`	`4`
`6`	`5`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`import requests`
`8`	`8`
`9`		`-`
`10`	`9`	`NOEMBED_ENDPOINT = "https://noembed.com/embed?url="`
`11`	`10`
`12`	`11`