Merge branch 'master' into cellview6

.editorconfig

@@ -1,5 +1,6 @@
 # Generated from:
 # https://github.com/plone/meta/tree/master/config/default
+# See the inline comments on how to expand/tweak this configuration file
 #
 # EditorConfig Configuration file, for more details see:
 # http://EditorConfig.org
@@ -32,8 +33,21 @@ indent_size = 4
 # 2 space indentation
 indent_size = 2
 
+[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss,html}]  # Frontend development
+# 2 space indentation
+indent_size = 2
+
 [{Makefile,.gitmodules}]
 # Tab indentation (no size specified, but view as 4 spaces)
 indent_style = tab
 indent_size = unset
 tab_width = unset
+
+
+##
+# Add extra configuration options in .meta.toml:
+#  [editorconfig]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##

setup.cfg → .flake8

@@ -1,8 +1,6 @@
 # Generated from:
 # https://github.com/plone/meta/tree/master/config/default
-[bdist_wheel]
-universal = 0
-
+# See the inline comments on how to expand/tweak this configuration file
 [flake8]
 doctests = 1
 ignore =
@@ -15,9 +13,10 @@ ignore =
     # black takes care of spaces after commas
     E231,
 
-[check-manifest]
-ignore =
-    .editorconfig
-    .meta.toml
-    .pre-commit-config.yaml
-    tox.ini
+##
+# Add extra configuration options in .meta.toml:
+#  [flake8]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##

.github/workflows/meta.yml

@@ -0,0 +1,28 @@
+# Generated from:
+# https://github.com/plone/meta/tree/master/config/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:
+
+jobs:
+  qa:
+    uses: plone/meta/.github/workflows/qa.yml@master
+  test:
+    uses: plone/meta/.github/workflows/test.yml@master
+  coverage:
+    uses: plone/meta/.github/workflows/coverage.yml@master
+  dependencies:
+    uses: plone/meta/.github/workflows/dependencies.yml@master
+  release-ready:
+    uses: plone/meta/.github/workflows/release_ready.yml@master
+  circular:
+    uses: plone/meta/.github/workflows/circular.yml@master

.gitignore

@@ -1,33 +1,51 @@
-.coverage
-*,cover
-/develop-eggs
-/eggs
-/fake-eggs
-/bin
-/local
-/parts
-/downloads
-/var
-/build
-/dist
-/local.cfg
-/*.egg-info
-/.installed.cfg
+# Generated from:
+# https://github.com/plone/meta/tree/master/config/default
+# See the inline comments on how to expand/tweak this configuration file
+# python related
+*.egg-info
 *.pyc
-/.Python
-/include
-/lib
-/.project
-/.pydevproject
-/.mr.developer.cfg
-/src/*
-/robot_*
-/test_*
-*.mo
-docs/Makefile
-docs/make.bat
-docs/doctrees
-docs/html
-library-settings.txt
-pip-selfcheck.json
-venv
+*.pyo
+
+# tools related
+build/
+.coverage
+coverage.xml
+dist/
+docs/_build
+__pycache__/
+.tox
+.vscode/
+node_modules/
+
+# venv / buildout related
+bin/
+develop-eggs/
+eggs/
+.eggs/
+etc/
+.installed.cfg
+include/
+lib/
+lib64
+.mr.developer.cfg
+parts/
+pyvenv.cfg
+var/
+
+# mxdev
+/instance/
+/.make-sentinels/
+/*-mxdev.txt
+/reports/
+/sources/
+/venv/
+.installed.txt
+
+
+##
+# Add extra configuration options in .meta.toml:
+#  [gitignore]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##

.meta.toml

@@ -1,8 +1,10 @@
 # Generated from:
 # https://github.com/plone/meta/tree/master/config/default
+# See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "112d1c69"
+commit-id = "7723aeaf"
 
-[codespell]
-additional-ignores = "discreet,oder,ist,crate"
+[pyproject]
+codespell_ignores = "oder,ist,crate"
+dependencies_ignores = "['ZServer', 'plone.app.event', 'Products.CFMPlone',]"

.pre-commit-config.yaml

@@ -1,12 +1,13 @@
 # Generated from:
 # https://github.com/plone/meta/tree/master/config/default
+# See the inline comments on how to expand/tweak this configuration file
 ci:
     autofix_prs: false
     autoupdate_schedule: monthly
 
 repos:
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.2
+    rev: v3.4.0
     hooks:
     -   id: pyupgrade
         args: [--py38-plus]
@@ -19,9 +20,17 @@ repos:
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
-    rev: 3.0.4
+    rev: 3.1.0a2
     hooks:
     -   id: zpretty
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pre_commit]
+#  zpretty_extra_lines = """
+#  _your own configuration lines_
+#  """
+##
 -   repo: https://github.com/PyCQA/flake8
     rev: 6.0.0
     hooks:
@@ -32,6 +41,14 @@ repos:
     -   id: codespell
         additional_dependencies:
           - tomli
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pre_commit]
+#  codespell_extra_lines = """
+#  _your own configuration lines_
+#  """
+##
 -   repo: https://github.com/mgedmin/check-manifest
     rev: "0.49"
     hooks:
@@ -40,3 +57,20 @@ repos:
     rev: "4.2"
     hooks:
     -   id: pyroma
+-   repo: https://github.com/mgedmin/check-python-versions
+    rev: "0.21.2"
+    hooks:
+    -   id: check-python-versions
+        args: ['--only', 'setup.py,pyproject.toml']
+-   repo: https://github.com/collective/i18ndude
+    rev: "6.0.0"
+    hooks:
+    -   id: i18ndude
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pre_commit]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##

news/7723aeaf.internal

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

plone/app/contenttypes/browser/templates/image.pt

@@ -63,8 +63,16 @@
               <span class="d-none"
                     i18n:translate="image_size_label"
               >File size</span>
-              <tal:mb condition="use_MB">${python:round(size/1024/1024, 1)} MB</tal:mb>
-              <tal:kb condition="not: use_MB">${python:round(size/1024, 1)} KB</tal:kb>
+              <tal:mb condition="use_MB"
+                      i18n:translate=""
+              >
+                <tal:size i18n:name="size">${python:round(size/1024/1024, 1)}</tal:size>
+                MB</tal:mb>
+              <tal:kb condition="not: use_MB"
+                      i18n:translate=""
+              >
+                <tal:size i18n:name="size">${python:round(size/1024, 1)}</tal:size>
+                KB</tal:kb>
             </div>
           </div>
 

pyproject.toml

@@ -1,8 +1,9 @@
 # Generated from:
 # https://github.com/plone/meta/tree/master/config/default
+# See the inline comments on how to expand/tweak this configuration file
 [tool.towncrier]
-filename = "CHANGES.rst"
 directory = "news/"
+filename = "CHANGES.rst"
 title_format = "{version} ({project_date})"
 underlines = ["-", ""]
 
@@ -44,22 +45,90 @@ target-version = ["py38"]
 
 [tool.codespell]
 ignore-words-list = "discreet,oder,ist,crate"
+skip = "*.po,"
+##
+# Add extra configuration options in .meta.toml:
+#  [pyproject]
+#  codespell_ignores = "foo,bar"
+#  codespell_skip = "*.po,*.map,package-lock.json"
+##
 
 [tool.dependencychecker]
 Zope = [
   # Zope own provided namespaces
   'App', 'OFS', 'Products.Five', 'Products.OFSP', 'Products.PageTemplates',
   'Products.SiteAccess', 'Shared', 'Testing', 'ZPublisher', 'ZTUtils',
   'Zope2', 'webdav', 'zmi',
+  # ExtensionClass own provided namespaces
+  'ExtensionClass', 'ComputedAttribute', 'MethodObject',
   # Zope dependencies
-  'Acquisition', 'DateTime', 'transaction', 'zExceptions', 'ZODB', 'zope.component',
-  'zope.configuration', 'zope.container', 'zope.deferredimport', 'zope.event',
-  'zope.exceptions', 'zope.globalrequest', 'zope.i18n', 'zope.i18nmessageid',
-  'zope.interface', 'zope.lifecycleevent', 'zope.location', 'zope.publisher',
-  'zope.schema', 'zope.security', 'zope.site', 'zope.traversing', 'AccessControl',
+  'AccessControl', 'Acquisition', 'AuthEncoding', 'beautifulsoup4', 'BTrees',
+  'cffi', 'Chameleon', 'DateTime', 'DocumentTemplate',
+  'MultiMapping', 'multipart', 'PasteDeploy', 'Persistence', 'persistent',
+  'pycparser', 'python-gettext', 'pytz', 'RestrictedPython', 'roman',
+  'soupsieve', 'transaction', 'waitress', 'WebOb', 'WebTest', 'WSGIProxy2',
+  'z3c.pt', 'zc.lockfile', 'ZConfig', 'zExceptions', 'ZODB', 'zodbpickle',
+  'zope.annotation', 'zope.browser', 'zope.browsermenu', 'zope.browserpage',
+  'zope.browserresource', 'zope.cachedescriptors', 'zope.component',
+  'zope.configuration', 'zope.container', 'zope.contentprovider',
+  'zope.contenttype', 'zope.datetime', 'zope.deferredimport',
+  'zope.deprecation', 'zope.dottedname', 'zope.event', 'zope.exceptions',
+  'zope.filerepresentation', 'zope.globalrequest', 'zope.hookable',
+  'zope.i18n', 'zope.i18nmessageid', 'zope.interface', 'zope.lifecycleevent',
+  'zope.location', 'zope.pagetemplate', 'zope.processlifetime', 'zope.proxy',
+  'zope.ptresource', 'zope.publisher', 'zope.schema', 'zope.security',
+  'zope.sequencesort', 'zope.site', 'zope.size', 'zope.structuredtext',
+  'zope.tal', 'zope.tales', 'zope.testbrowser', 'zope.testing',
+  'zope.traversing', 'zope.viewlet'
+]
+'Products.CMFCore' = [
+  'docutils', 'five.localsitemanager', 'Missing', 'Products.BTreeFolder2',
+  'Products.GenericSetup', 'Products.MailHost', 'Products.PythonScripts',
+  'Products.StandardCacheManagers', 'Products.ZCatalog', 'Record',
+  'zope.sendmail', 'Zope'
 ]
 'plone.base' = [
-  'AccessControl', 'Products.BTreeFolder2', 'Products.CMFCore',
-  'Products.CMFDynamicViewFTI', 'zope.deprecation',
+  'plone.batching', 'plone.registry', 'plone.schema','plone.z3cform',
+  'Products.CMFCore', 'Products.CMFDynamicViewFTI',
 ]
 python-dateutil = ['dateutil']
+ignore-packages = ['ZServer', 'plone.app.event', 'Products.CMFPlone',]
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pyproject]
+#  dependencies_ignores = "['zestreleaser.towncrier']"
+#  dependencies_mappings = [
+#    "gitpython = ['git']",
+#    "pygithub = ['github']",
+#  ]
+#  """
+##
+
+[tool.check-manifest]
+ignore = [
+    ".editorconfig",
+    ".meta.toml",
+    ".pre-commit-config.yaml",
+    "tox.ini",
+    ".flake8",
+    "mx.ini",
+
+]
+##
+# Add extra configuration options in .meta.toml:
+#  [pyproject]
+#  check_manifest_ignores = """
+#      "*.map.js",
+#      "*.pyc",
+#  """
+##
+
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pyproject]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##

setup.py

@@ -61,6 +61,7 @@ def read(*rnames):
         "plone.app.z3cform>=1.1.0",
         "zope.deprecation",
         "plone.base",
+        "Products.BTreeFolder2",
         "Products.GenericSetup",
         "Products.MimetypesRegistry",
         "Products.PortalTransforms",