Merge remote-tracking branch 'origin/main' into fhnw-develop

Author: davisagli

.editorconfig

@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/default
+# https://github.com/plone/meta/tree/main/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,13 +30,15 @@ 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
 
 [{Makefile,.gitmodules}]
 # Tab indentation (no size specified, but view as 4 spaces)

.flake8

@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/default
+# https://github.com/plone/meta/tree/main/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 [flake8]
 doctests = 1

.github/workflows/meta.yml

@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/default
+# https://github.com/plone/meta/tree/main/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 name: Meta
 on:
@@ -57,6 +57,13 @@ 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:

.github/workflows/test-plone-5.2.yml

@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/default
+# https://github.com/plone/meta/tree/main/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 # python related
 *.egg-info
@@ -12,13 +12,16 @@
 # tools related
 build/
 .coverage
+.*project
 coverage.xml
 dist/
 docs/_build
 __pycache__/
 .tox
 .vscode/
 node_modules/
+forest.dot
+forest.json
 
 # venv / buildout related
 bin/
@@ -34,6 +37,7 @@ lib64
 parts/
 pyvenv.cfg
 var/
+local.cfg
 
 # mxdev
 /instance/
@@ -54,5 +58,3 @@ requirements-mxdev.txt
 #  _your own configuration lines_
 #  """
 ##
-
-.DS_Store

.gitignore

@@ -1,16 +1,16 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/default
+# https://github.com/plone/meta/tree/main/src/plone/meta/default
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "b3ba013b"
+commit-id = "2.0.1.dev0"
 
 [pyproject]
 codespell_skip = "*"
 codespell_ignores = "vew"
 dependencies_ignores = "['plone.volto', 'zestreleaser.towncrier', 'zest.releaser', 'pytest', 'pytest-cov', 'pytest-plone', 'pytest-docker']"
 dependencies_mappings = [
-    "Plone = ['Products.CMFPlone', 'Products.CMFCore', 'Products.GenericSetup']",
+    "Products.CMFPlone = ['Zope', 'Products.CMFCore', 'plone.app.caching', 'plone.app.iterate', 'plone.indexer', 'plone.protect', 'plone.schema']",
     ]
 check_manifest_ignores = """
     "news/*",

.meta.toml

@@ -1,22 +1,22 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/default
+# https://github.com/plone/meta/tree/main/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.8.0
+    rev: v3.19.1
     hooks:
     -   id: pyupgrade
         args: [--py38-plus]
 -   repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 6.0.0
     hooks:
     -   id: isort
 -   repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 25.1.0
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
@@ -32,7 +32,7 @@ repos:
 #  """
 ##
 -   repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    rev: 7.1.1
     hooks:
     -   id: flake8
 
@@ -44,7 +44,7 @@ repos:
 #  """
 ##
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.2.5
+    rev: v2.4.1
     hooks:
     -   id: codespell
         additional_dependencies:
@@ -58,20 +58,20 @@ repos:
 #  """
 ##
 -   repo: https://github.com/mgedmin/check-manifest
-    rev: "0.49"
+    rev: "0.50"
     hooks:
     -   id: check-manifest
 -   repo: https://github.com/regebro/pyroma
     rev: "4.2"
     hooks:
     -   id: pyroma
 -   repo: https://github.com/mgedmin/check-python-versions
-    rev: "0.21.3"
+    rev: "0.22.1"
     hooks:
     -   id: check-python-versions
         args: ['--only', 'setup.py,pyproject.toml']
 -   repo: https://github.com/collective/i18ndude
-    rev: "6.0.0"
+    rev: "6.2.1"
     hooks:
     -   id: i18ndude
 

.pre-commit-config.yaml

@@ -55,8 +55,8 @@ clean-instance: ## remove existing instance
 .PHONY: clean-venv
 clean-venv: ## remove virtual environment
 	rm -fr bin include lib lib64 env pyvenv.cfg .tox .pytest_cache requirements-mxdev.txt
-	cp constraints-6.0.txt constraints.txt
-	cp requirements-6.0.txt requirements.txt
+	cp constraints-6.1.txt constraints.txt
+	cp requirements-6.1.txt requirements.txt
 
 .PHONY: clean-build
 clean-build: ## remove build artifacts
@@ -90,13 +90,13 @@ constraints-mxdev.txt:  bin/tox
 .PHONY: config
 config: bin/pip  ## Create instance configuration
 	@echo "$(GREEN)==> Create instance configuration$(RESET)"
-	bin/cookiecutter -f --no-input --config-file instance.yaml gh:plone/cookiecutter-zope-instance
+	bin/cookiecutter -f --no-input -c 2.1.1 --config-file instance.yaml gh:plone/cookiecutter-zope-instance
 
-.PHONY: install-plone-6.0
-install-plone-6.0: bin/mxdev config ## pip install Plone packages
+.PHONY: install-plone-6.1
+install-plone-6.1: bin/mxdev config ## pip install Plone packages
 	@echo "$(GREEN)==> Setup Build$(RESET)"
-	cp constraints-6.0.txt constraints.txt
-	cp requirements-6.0.txt requirements.txt
+	cp constraints-6.1.txt constraints.txt
+	cp requirements-6.1.txt requirements.txt
 	bin/tox -e init
 	bin/mxdev -c mx.ini
 	bin/pip install -r requirements-mxdev.txt
@@ -112,7 +112,7 @@ install-plone-5.2: bin/mxdev config ## pip install Plone packages
 	bin/pip install -r requirements-mxdev.txt
 
 .PHONY: install
-install: install-plone-6.0  ## Install Plone 6.0
+install: install-plone-6.1  ## Install Plone 6.1
 
 .PHONY: start
 start: ## Start a Plone instance on localhost:8080

Makefile

@@ -1 +1 @@
--c https://dist.plone.org/release/5.2.5/constraints.txt
+-c https://dist.plone.org/release/5.2.14/constraints.txt