Merge branch 'master' into gforcada-patch-1

Author: gforcada

.flake8

@@ -13,12 +13,12 @@ ignore =
     # black takes care of spaces after commas
     E231,
 per-file-ignores =
-    Products/CMFPlone/patches/__init__.py: F401,E402
-    Products/CMFPlone/skins/plone_scripts/*.py: E265,E266,F401,F821,F706
-    Products/CMFPlone/earlypatches/security.py: E402
-    Products/CMFPlone/UnicodeSplitter/__init__.py: F401,F403
-    Products/CMFPlone/utils.py: F821
-    Products/CMFPlone/patches/speed.py: E402
+    src/Products/CMFPlone/patches/__init__.py: F401,E402
+    src/Products/CMFPlone/skins/plone_scripts/*.py: E265,E266,F401,F821,F706
+    src/Products/CMFPlone/earlypatches/security.py: E402
+    src/Products/CMFPlone/UnicodeSplitter/__init__.py: F401,F403
+    src/Products/CMFPlone/utils.py: F821
+    src/Products/CMFPlone/patches/speed.py: E402
 
 ##
 # Add extra configuration options in .meta.toml:

.github/ISSUE_TEMPLATE/PLIP.md

@@ -0,0 +1,77 @@
+# Generated from:
+# https://github.com/plone/meta/tree/main/src/plone/meta/default
+# See the inline comments on how to expand/tweak this configuration file
+name: Tests
+
+on:
+  push:
+
+jobs:
+  build:
+    permissions:
+      contents: read
+      pull-requests: write
+    strategy:
+      # We want to see all failures:
+      fail-fast: false
+      matrix:
+        os:
+        - ["ubuntu", "ubuntu-latest"]
+        config:
+        # [Python version, visual name, tox env]
+        - ["3.13", "6.2 on py3.13", "py313-plone62"]
+        - ["3.10", "6.2 on py3.10", "py310-plone62"]
+
+    runs-on: ${{ matrix.os[1] }}
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    name: ${{ matrix.config[1] }}
+    steps:
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
+    - name: Set up Python
+      uses: actions/setup-python@v6
+      with:
+        python-version: ${{ matrix.config[0] }}
+        allow-prereleases: true
+    - name: locale
+      # needed for CMFPlone testUnicodeSplitter test
+      run: |
+        sudo locale-gen nl_NL@euro
+        sudo update-locale
+
+##
+# Add extra configuration options in .meta.toml:
+#  [github]
+#  extra_lines_after_os_dependencies = """
+#  _your own configuration lines_
+#  """
+##
+    - name: Pip cache
+      uses: actions/cache@v4
+      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
+    - name: Test
+      run: tox -e ${{ matrix.config[2] }}
+
+
+##
+# Add extra configuration options in .meta.toml:
+#  [github]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##

.github/workflows/test-matrix.yml

@@ -3,17 +3,17 @@
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "2.0.1.dev0"
+commit-id = "2.2.2"
 
 [flake8]
 extra_lines = """
 per-file-ignores =
-    Products/CMFPlone/patches/__init__.py: F401,E402
-    Products/CMFPlone/skins/plone_scripts/*.py: E265,E266,F401,F821,F706
-    Products/CMFPlone/earlypatches/security.py: E402
-    Products/CMFPlone/UnicodeSplitter/__init__.py: F401,F403
-    Products/CMFPlone/utils.py: F821
-    Products/CMFPlone/patches/speed.py: E402
+    src/Products/CMFPlone/patches/__init__.py: F401,E402
+    src/Products/CMFPlone/skins/plone_scripts/*.py: E265,E266,F401,F821,F706
+    src/Products/CMFPlone/earlypatches/security.py: E402
+    src/Products/CMFPlone/UnicodeSplitter/__init__.py: F401,F403
+    src/Products/CMFPlone/utils.py: F821
+    src/Products/CMFPlone/patches/speed.py: E402
 """
 
 [pre_commit]
@@ -33,7 +33,7 @@ dependencies_mappings = [
 ]
 
 [tox]
-test_matrix = {"6.2" = ["3.12", "3.10"]}
+test_matrix = {"6.2" = ["*"]}
 
 [github]
 jobs = [
@@ -42,3 +42,11 @@ jobs = [
    "release_ready",
    "circular",
    ]
+extra_lines_after_os_dependencies = """
+    - name: locale
+      # needed for CMFPlone testUnicodeSplitter test
+      run: |
+        sudo locale-gen nl_NL@euro
+        sudo update-locale
+"""
+

.meta.toml

@@ -7,20 +7,20 @@ ci:
 
 repos:
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.1
+    rev: v3.21.0
     hooks:
     -   id: pyupgrade
         args: [--py38-plus]
 -   repo: https://github.com/pycqa/isort
-    rev: 6.0.0
+    rev: 7.0.0
     hooks:
     -   id: isort
--   repo: https://github.com/psf/black
-    rev: 25.1.0
+-   repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 25.9.0
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
-    rev: 3.1.0
+    rev: 3.1.1
     hooks:
     -   id: zpretty
         exclude: .pt
@@ -33,7 +33,7 @@ repos:
 #  """
 ##
 -   repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
+    rev: 7.3.0
     hooks:
     -   id: flake8
 
@@ -59,15 +59,15 @@ repos:
 #  """
 ##
 -   repo: https://github.com/mgedmin/check-manifest
-    rev: "0.50"
+    rev: "0.51"
     hooks:
     -   id: check-manifest
 -   repo: https://github.com/regebro/pyroma
-    rev: "4.2"
+    rev: "5.0"
     hooks:
     -   id: pyroma
 -   repo: https://github.com/mgedmin/check-python-versions
-    rev: "0.22.1"
+    rev: "0.23.0"
     hooks:
     -   id: check-python-versions
         args: ['--only', 'setup.py,pyproject.toml']

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-recursive-include Products *
+recursive-include src *
 recursive-include docs *
 include *
 global-exclude *.pyc