Merge pull request #105 from collective/config-with-plone-meta-2.4.0

Plone 6.2 only support

Author: erral

.coveragerc

@@ -1,6 +1,6 @@
 [report]
 include =
-    plone/*
+    src/plone/*
 
 omit =
     */test*

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

@@ -1,7 +1,7 @@
 # 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
+name: Tests
 
 on:
   push:
@@ -19,27 +19,31 @@ jobs:
         - ["ubuntu", "ubuntu-latest"]
         config:
         # [Python version, visual name, tox env]
-        - ["3.13", "6.2 on py3.13", "py313-plone62"]
+        - ["3.14", "6.2 on py3.14", "py314-plone62"]
         - ["3.10", "6.2 on py3.10", "py310-plone62"]
-        - ["3.13", "6.1 on py3.13", "py313-plone61"]
-        - ["3.10", "6.1 on py3.10", "py310-plone61"]
-        - ["3.9", "6.0 on py3.9", "py39-plone60"]
-        - ["3.13", "6.0 on py3.13", "py313-plone60"]
 
     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@v5
+    - 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
+
+##
+# Add extra configuration options in .meta.toml:
+#  [github]
+#  extra_lines_after_os_dependencies = """
+#  _your own configuration lines_
+#  """
+##
     - name: Pip cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
@@ -50,5 +54,19 @@ jobs:
       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,7 +3,10 @@
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "2.0.1.dev0"
+commit-id = "2.4.0"
+
+[tox]
+test_matrix = {"6.2" = ["*"]}
 
 [pyproject]
 codespell_skip = "*.min.js,*.min.js.map,*.svg,yarn.lock"

.meta.toml

@@ -7,16 +7,16 @@ ci:
 
 repos:
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.21.0
+    rev: v3.21.2
     hooks:
     -   id: pyupgrade
         args: [--py38-plus]
 -   repo: https://github.com/pycqa/isort
-    rev: 7.0.0
+    rev: 8.0.0
     hooks:
     -   id: isort
 -   repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.9.0
+    rev: 26.1.0
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
@@ -62,16 +62,16 @@ 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.23.0"
+    rev: "0.24.0"
     hooks:
     -   id: check-python-versions
         args: ['--only', 'setup.py,pyproject.toml']
 -   repo: https://github.com/collective/i18ndude
-    rev: "6.2.1"
+    rev: "6.3.0"
     hooks:
     -   id: i18ndude
 

.pre-commit-config.yaml

@@ -1,6 +1,7 @@
 recursive-include resources *.js
-recursive-include plone *
+recursive-include src *
 recursive-include docs *
+recursive-include news *
 include *
 global-exclude *.pyc
 exclude *.toml

MANIFEST.in

@@ -38,7 +38,7 @@ IMAGE_NAME=${PROJECT_NAME}
 CONSTRAINTS_IN=constraints.txt
 CONSTRAINTS_MXDEV=constraints-mxdev.txt
 PIP_REQUIREMENTS_IN_FILE=requirements.txt
-ADDONBASE=./
+ADDONBASE=./src
 ADDONFOLDER=${ADDONBASE}
 INSTANCE_YAML=instance.yaml
 INSTANCE_FOLDER=instance