update plone/meta

petschki · petschki · commit 4cc885e29435 · 2026-04-23T15:51:13.000+02:00
diff --git a/.editorconfig b/.editorconfig
@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/main/src/plone/meta/default
+# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 #
 # EditorConfig Configuration file, for more details see:
diff --git a/.flake8 b/.flake8
@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/main/src/plone/meta/default
+# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 [flake8]
 doctests = 1
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/main/src/plone/meta/default
+# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 version: 2
 updates:
diff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml
@@ -1,16 +1,10 @@
 # Generated from:
-# https://github.com/plone/meta/tree/main/src/plone/meta/default
+# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 name: Meta
+
 on:
   push:
-    branches:
-      - master
-      - main
-  pull_request:
-    branches:
-      - master
-      - main
   workflow_dispatch:
 
 ##
diff --git a/.github/workflows/test-matrix.yml b/.github/workflows/test-matrix.yml
@@ -1,10 +1,11 @@
 # Generated from:
-# https://github.com/plone/meta/tree/main/src/plone/meta/default
+# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 name: Tests
 
 on:
   push:
+  workflow_dispatch:
 
 jobs:
   build:
@@ -29,11 +30,15 @@ jobs:
     - uses: actions/checkout@v6
       with:
         persist-credentials: false
-    - name: Set up Python
-      uses: actions/setup-python@v6
+    - name: Install uv + caching
+      uses: astral-sh/setup-uv@v8.0.0
       with:
+        enable-cache: true
+        cache-dependency-glob: |
+          setup.*
+          tox.ini
+          pyproject.toml
         python-version: ${{ matrix.config[0] }}
-        allow-prereleases: true
 
 ##
 # Add extra configuration options in .meta.toml:
@@ -42,25 +47,13 @@ jobs:
 #  _your own configuration lines_
 #  """
 ##
-    - name: Pip cache
-      uses: actions/cache@v5
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-${{ matrix.config[0] }}-
-          ${{ runner.os }}-pip-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install tox
     - name: Initialize tox
       # the bash one-liner below does not work on Windows
       if: contains(matrix.os, 'ubuntu')
       run: |
-        if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
+        if [ `uvx tox list --no-desc -f init|wc -l` = 1 ]; then uvx --with tox-uv tox -e init;else true; fi
     - name: Test
-      run: tox -e ${{ matrix.config[2] }}
+      run: uvx --with tox-uv tox -e ${{ matrix.config[2] }}
 
 
 ##
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/main/src/plone/meta/default
+# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 # python related
 *.egg-info
diff --git a/.meta.toml b/.meta.toml
@@ -1,9 +1,9 @@
 # Generated from:
-# https://github.com/plone/meta/tree/main/src/plone/meta/default
+# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "2.3.1"
+commit-id = "2.8.0"
 
 [pyproject]
 codespell_skip = "*.js,*.min.js,*.min.js.map,*.css.map,yarn.lock,robot_*,test_*"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/main/src/plone/meta/default
+# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 ci:
     autofix_prs: false
@@ -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.11.0
+    rev: 26.3.1
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
@@ -44,7 +44,7 @@ repos:
 #  """
 ##
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
+    rev: v2.4.2
     hooks:
     -   id: codespell
         additional_dependencies:
@@ -62,14 +62,14 @@ repos:
     hooks:
     -   id: check-manifest
 -   repo: https://github.com/regebro/pyroma
-    rev: "5.0"
+    rev: "5.0.1"
     hooks:
     -   id: pyroma
 -   repo: https://github.com/mgedmin/check-python-versions
     rev: "0.24.0"
     hooks:
     -   id: check-python-versions
-        args: ['--only', 'setup.py,pyproject.toml']
+        args: ['--only', 'setup.py,tox.ini']
 -   repo: https://github.com/collective/i18ndude
     rev: "6.3.0"
     hooks:
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,8 +1,10 @@
 # Generated from:
-# https://github.com/plone/meta/tree/main/src/plone/meta/default
+# https://github.com/plone/meta/tree/2.x/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 +62,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.1.dev0"
 
 
diff --git a/src/collective/z3cform/datagridfield/__init__.py b/src/collective/z3cform/datagridfield/__init__.py
@@ -1,4 +1,3 @@
 from zope.i18nmessageid import MessageFactory
 
-
 _ = MessageFactory("collective.z3cform.datagridfield")
diff --git a/src/collective/z3cform/datagridfield/autoform.py b/src/collective/z3cform/datagridfield/autoform.py
@@ -17,7 +17,6 @@
 from zope.component import adapter
 from zope.i18nmessageid import Message
 
-
 # XXX: The following controversial and may have side effects.
 # Its only purpose is to hide redundant error messages. Every
 # error within a subform seem to be rendered both for
diff --git a/src/collective/z3cform/datagridfield/datagridfield.py b/src/collective/z3cform/datagridfield/datagridfield.py
@@ -32,7 +32,6 @@
 import logging
 import lxml
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/src/collective/z3cform/datagridfield/demo/editform_object.py b/src/collective/z3cform/datagridfield/demo/editform_object.py
@@ -19,7 +19,6 @@
 from zope.schema import getFieldsInOrder
 from zope.schema.fieldproperty import FieldProperty
 
-
 # Uncomment, if you want to try the relationfield
 # from plone.app.vocabularies.catalog import CatalogSource
 # from z3c.relationfield.schema import RelationChoice
diff --git a/src/collective/z3cform/datagridfield/locales/update.py b/src/collective/z3cform/datagridfield/locales/update.py
@@ -1,7 +1,6 @@
 import os
 import subprocess
 
-
 domain = "collective.z3cform.datagridfield"
 os.chdir("../../../")
 target_path = "src/collective/z3cform/datagridfield/"
diff --git a/src/collective/z3cform/datagridfield/registry.py b/src/collective/z3cform/datagridfield/registry.py
@@ -1,6 +1,5 @@
 from collective.z3cform.datagridfield.row import DictRow as BaseDictRow
 
-
 try:
     from plone.registry.field import PersistentField
 except ImportError:
diff --git a/src/collective/z3cform/datagridfield/row.py b/src/collective/z3cform/datagridfield/row.py
@@ -25,6 +25,10 @@
 from zope.schema.interfaces import WrongContainedType
 from zope.security.interfaces import IPermission
 
+import logging
+
+logger = logging.getLogger(__name__)
+
 
 def _sanitize_field_value(fld, value):
     """Strip acquisition wrappers from a converted field value.
diff --git a/src/collective/z3cform/datagridfield/supermodel.py b/src/collective/z3cform/datagridfield/supermodel.py
@@ -1,5 +1,4 @@
 from collective.z3cform.datagridfield.row import DictRow
 from plone.supermodel.exportimport import ObjectHandler
 
-
 DictRowHandler = ObjectHandler(DictRow)
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/main/src/plone/meta/default
+# https://github.com/plone/meta/tree/2.x/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 [tox]
 # We need 4.4.0 for constrain_package_deps.
@@ -19,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]
@@ -66,9 +67,9 @@ description = check if the package defines all its dependencies
 skip_install = true
 deps =
     build
-    z3c.dependencychecker==2.14.3
+    z3c.dependencychecker==3.0
 commands =
-    python -m build --sdist
+    python -m build --wheel
     dependencychecker
 
 [testenv:dependencies-graph]
@@ -99,7 +100,7 @@ coverage =
 description = shared configuration for tests and coverage
 use_develop = true
 skip_install = false
-constrain_package_deps = false
+constrain_package_deps = true
 set_env =
     ROBOT_BROWSER=headlesschrome
 
@@ -136,6 +137,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
`@@ -1,5 +1,5 @@`
`1`	`1`	`# Generated from:`
`2`		`-# https://github.com/plone/meta/tree/main/src/plone/meta/default`
	`2`	`+# https://github.com/plone/meta/tree/2.x/src/plone/meta/default`
`3`	`3`	`# See the inline comments on how to expand/tweak this configuration file`
`4`	`4`	`#`
`5`	`5`	`# EditorConfig Configuration file, for more details see:`
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.1.dev0"`
`5`	`4`
`6`	`5`