upgrade meta

.editorconfig

@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/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:
@@ -13,7 +13,8 @@
 root = true
 
 
-[*]  # For All Files
+[*]
+# Default settings for all files.
 # Unix-style newlines with a newline ending every file
 end_of_line = lf
 insert_final_newline = true
@@ -29,11 +30,12 @@ max_line_length = off
 # 4 space indentation
 indent_size = 4
 
-[*.{yml,zpt,pt,dtml,zcml}]
+[*.{yml,zpt,pt,dtml,zcml,html,xml}]
 # 2 space indentation
 indent_size = 2
 
-[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss,html}]  # Frontend development
+[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}]
+# Frontend development
 # 2 space indentation
 indent_size = 2
 max_line_length = 80

.flake8

@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/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

.github/dependabot.yml

@@ -0,0 +1,13 @@
+# Generated from:
+# 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:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"
+    cooldown:
+      default-days: 7

.github/workflows/meta.yml

@@ -1,19 +1,11 @@
 # Generated from:
-# https://github.com/plone/meta/tree/main/config/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
-permissions:
-  contents: read
-  pull-requests: write
+permissions: {}
+
 on:
   push:
-    branches:
-      - master
-      - main
-  pull_request:
-    branches:
-      - master
-      - main
   workflow_dispatch:
 
 ##
@@ -28,24 +20,21 @@ on:
 
 jobs:
   qa:
-    uses: plone/meta/.github/workflows/qa.yml@main
-#  test:
-#    uses: plone/meta/.github/workflows/test.yml@main
-#    with:
-#       py-versions: '["3.12", "3.11", "3.10"]'
-#  coverage:
-#    uses: plone/meta/.github/workflows/coverage.yml@main
-#  dependencies:
-#    uses: plone/meta/.github/workflows/dependencies.yml@main
+    uses: plone/meta/.github/workflows/qa.yml@2.x
+  coverage:
+    uses: plone/meta/.github/workflows/coverage.yml@2.x
+    with:
+       os-packages: 'libldap2-dev libsasl2-dev'
+  dependencies:
+    uses: plone/meta/.github/workflows/dependencies.yml@2.x
   release_ready:
-    uses: plone/meta/.github/workflows/release_ready.yml@main
+    uses: plone/meta/.github/workflows/release_ready.yml@2.x
 
 ##
 # To modify the list of default jobs being created add in .meta.toml:
 # [github]
 # jobs = [
 #    "qa",
-#    "test",
 #    "coverage",
 #    "dependencies",
 #    "release_ready",
@@ -60,13 +49,6 @@ jobs:
 # os_dependencies = "git libxml2 libxslt"
 ##
 
-##
-# To test against a specific matrix of python versions
-# when running tests jobs, add in .meta.toml:
-# [github]
-# py_versions = "['3.12', '3.11']"
-##
-
 
 ##
 # Specify additional jobs in .meta.toml:

.gitignore

@@ -1,21 +1,27 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/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
 *.pyc
 *.pyo
 
+# translation related
+*.mo
+
 # tools related
 build/
 .coverage
+.*project
 coverage.xml
 dist/
 docs/_build
 __pycache__/
 .tox
 .vscode/
 node_modules/
+forest.dot
+forest.json
 
 # venv / buildout related
 bin/
@@ -31,6 +37,7 @@ lib64
 parts/
 pyvenv.cfg
 var/
+local.cfg
 
 # mxdev
 /instance/
@@ -40,7 +47,10 @@ var/
 /sources/
 /venv/
 .installed.txt
+
 .lock
+.python-version
+.venv/
 
 ##
 # Add extra configuration options in .meta.toml:

.meta.toml

@@ -1,34 +1,34 @@
 # Generated from:
-# https://github.com/plone/meta/tree/main/config/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 = "71d0218b"
+commit-id = "2.11.0"
 
 [pyproject]
 codespell_skip = "*.min.js,*.ldif"
 codespell_ignores = "vew"
-dependencies_mappings = [
-  "pytest-plone = ['pytest', 'plone.testing', 'plone.app.testing']",
-]
-dependencies_ignores = "['plone.app.iterate', 'plone.app.upgrade', 'plone.volto', 'zestreleaser.towncrier', 'zest.releaser', 'pytest-cov']"
+dependencies_ignores = "['plone.app.iterate', 'plone.app.upgrade', 'plone.volto', 'zestreleaser.towncrier', 'zest.releaser', 'zest.pocompile', 'pytest', 'pytest-cov', 'setuptools']"
 
 [gitignore]
 extra_lines = """
 .lock
+.python-version
+.venv/
 """
 
 [tox]
 test_runner = "pytest"
 test_path = "/tests"
 use_mxdev = true
+use_test_matrix = false
 test_deps_additional = ""
 
 [github]
+os_dependencies = "libldap2-dev libsasl2-dev"
 py_versions = "[\"3.12\", \"3.11\", \"3.10\"]"
 jobs = [
     "qa",
-    "test",
     "coverage",
     "dependencies",
     "release_ready",

.pre-commit-config.yaml

@@ -1,26 +1,26 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/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
     autoupdate_schedule: monthly
 
 repos:
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.14.0
+    rev: v3.21.2
     hooks:
     -   id: pyupgrade
-        args: [--py38-plus]
+        args: [--py39-plus]
 -   repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 9.0.0b1
     hooks:
     -   id: isort
--   repo: https://github.com/psf/black
-    rev: 23.9.1
+-   repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 26.5.1
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
-    rev: 3.1.0
+    rev: 4.0.3
     hooks:
     -   id: zpretty
 
@@ -32,7 +32,7 @@ repos:
 #  """
 ##
 -   repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
+    rev: 7.3.0
     hooks:
     -   id: flake8
 
@@ -44,7 +44,7 @@ repos:
 #  """
 ##
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.4.3
     hooks:
     -   id: codespell
         additional_dependencies:
@@ -58,20 +58,20 @@ repos:
 #  """
 ##
 -   repo: https://github.com/mgedmin/check-manifest
-    rev: "0.49"
+    rev: "0.51"
     hooks:
     -   id: check-manifest
 -   repo: https://github.com/regebro/pyroma
-    rev: "4.2"
+    rev: "5.1b1"
     hooks:
     -   id: pyroma
 -   repo: https://github.com/mgedmin/check-python-versions
-    rev: "0.21.3"
+    rev: "0.24.2"
     hooks:
     -   id: check-python-versions
-        args: ['--only', 'setup.py,pyproject.toml']
+        args: ['--only', 'setup.py']
 -   repo: https://github.com/collective/i18ndude
-    rev: "6.1.0"
+    rev: "6.3.0"
     hooks:
     -   id: i18ndude
 

news/+dependencies.bugfix

@@ -0,0 +1 @@
+Declare all directly imported dependencies explicitly and drop unused ones (``collective.regenv``, ``yafowil.plone``, ``yafowil.bootstrap``, ``plone.restapi``) @mamico

news/+meta.internal

@@ -0,0 +1 @@
+Update configuration files @plone

news/+remove-profiles.breaking

@@ -0,0 +1 @@
+Remove the unused GenericSetup install/uninstall profile scaffolding (it was never wired into ``configure.zcml``, so the addon was never actually installable through it) and the corresponding installation tests @mamico

news/.changelog_template.jinja

@@ -1,9 +1,9 @@
-{% if sections[] %}
-{% for category, val in definitions.items() if category in sections[] %}
+{% if sections[""] %}
+{% for category, val in definitions.items() if category in sections[""] %}
 
 ### {{ definitions[category]['name'] }}
 
-{% for text, values in sections[][category].items() %}
+{% for text, values in sections[""][category].items() %}
 - {{ text }} {{ values|join(', ') }}
 {% endfor %}
 
@@ -12,4 +12,4 @@
 No significant changes.
 
 
-{% endif %}
+{% endif %}

pyproject.toml

@@ -1,8 +1,10 @@
 # Generated from:
-# https://github.com/plone/meta/tree/main/config/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>=75.1"]
+requires = ["setuptools>=68.2,<82", "wheel"]
+
+
 
 [tool.towncrier]
 directory = "news/"
@@ -14,27 +16,27 @@ underlines = ["", "", ""]
 
 [[tool.towncrier.type]]
 directory = "breaking"
-name = "Breaking changes:"
+name = "Breaking changes"
 showcontent = true
 
 [[tool.towncrier.type]]
 directory = "feature"
-name = "New features:"
+name = "New features"
 showcontent = true
 
 [[tool.towncrier.type]]
 directory = "bugfix"
-name = "Bug fixes:"
+name = "Bug fixes"
 showcontent = true
 
 [[tool.towncrier.type]]
 directory = "internal"
-name = "Internal:"
+name = "Internal"
 showcontent = true
 
 [[tool.towncrier.type]]
 directory = "documentation"
-name = "Documentation:"
+name = "Documentation"
 showcontent = true
 
 [[tool.towncrier.type]]
@@ -62,7 +64,7 @@ profile = "plone"
 ##
 
 [tool.black]
-target-version = ["py38"]
+target-version = ["py39"]
 
 ##
 # Add extra configuration options in .meta.toml:
@@ -73,7 +75,7 @@ target-version = ["py38"]
 ##
 
 [tool.codespell]
-ignore-words-list = "discreet,vew"
+ignore-words-list = "discreet,assertin,thet,vew"
 skip = "*.po,*.min.js,*.ldif"
 ##
 # Add extra configuration options in .meta.toml:
@@ -121,8 +123,8 @@ Zope = [
   'Products.CMFCore', 'Products.CMFDynamicViewFTI',
 ]
 python-dateutil = ['dateutil']
-pytest-plone = ['pytest', 'plone.testing', 'plone.app.testing']
-ignore-packages = ['plone.app.iterate', 'plone.app.upgrade', 'plone.volto', 'zestreleaser.towncrier', 'zest.releaser', 'pytest-cov']
+pytest-plone = ['pytest', 'zope.pytestlayer', 'plone.testing', 'plone.app.testing']
+ignore-packages = ['plone.app.iterate', 'plone.app.upgrade', 'plone.volto', 'zestreleaser.towncrier', 'zest.releaser', 'zest.pocompile', 'pytest', 'pytest-cov', 'setuptools']
 
 ##
 # Add extra configuration options in .meta.toml:

scripts/create_site.py

@@ -10,7 +10,6 @@
 import os
 import transaction
 
-
 truthy = frozenset(("t", "true", "y", "yes", "on", "1"))