From 25412ad72a34b1f60677938806392a3f486351ab Mon Sep 17 00:00:00 2001 From: Mikel Larreategi Date: Wed, 28 Jan 2026 08:30:23 +0100 Subject: [PATCH] feat: remove testing in Plone 6.2 and configure plone.meta --- .github/workflows/test-matrix.yml | 27 +++++++++++++++++++++------ .meta.toml | 5 ++++- .pre-commit-config.yaml | 8 ++++---- news/+meta.internal | 2 ++ news/323.feature | 1 + tox.ini | 29 +++++++++++------------------ 6 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 news/+meta.internal create mode 100644 news/323.feature diff --git a/.github/workflows/test-matrix.yml b/.github/workflows/test-matrix.yml index f96e8075..daca1aa0 100644 --- a/.github/workflows/test-matrix.yml +++ b/.github/workflows/test-matrix.yml @@ -19,18 +19,16 @@ jobs: - ["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"] + - ["3.13", "6.0 on py3.13", "py313-plone60"] + - ["3.10", "6.0 on py3.10", "py310-plone60"] - ["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 @@ -38,8 +36,16 @@ jobs: 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') }} @@ -57,3 +63,12 @@ jobs: 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_ +# """ +## diff --git a/.meta.toml b/.meta.toml index d5f748c1..5f8ca5f9 100644 --- a/.meta.toml +++ b/.meta.toml @@ -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.3.1" + +[tox] +test_matrix = {"6.0" = ["*"], "6.1" = ["*"]} [github] jobs = [ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 772f36b1..48000c4a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ ci: repos: - repo: https://github.com/asottile/pyupgrade - rev: v3.21.0 + rev: v3.21.2 hooks: - id: pyupgrade args: [--py38-plus] @@ -16,7 +16,7 @@ repos: hooks: - id: isort - repo: https://github.com/psf/black-pre-commit-mirror - rev: 25.9.0 + rev: 25.11.0 hooks: - id: black - repo: https://github.com/collective/zpretty @@ -67,12 +67,12 @@ repos: 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 exclude: plone/app/content/browser/contents diff --git a/news/+meta.internal b/news/+meta.internal new file mode 100644 index 00000000..c08f5399 --- /dev/null +++ b/news/+meta.internal @@ -0,0 +1,2 @@ +Update configuration files. +[plone devs] diff --git a/news/323.feature b/news/323.feature new file mode 100644 index 00000000..a5104d70 --- /dev/null +++ b/news/323.feature @@ -0,0 +1 @@ +Do not test in Plone 6.2.x @erral diff --git a/tox.ini b/tox.ini index e420ed36..9a319a5d 100644 --- a/tox.ini +++ b/tox.ini @@ -7,29 +7,25 @@ min_version = 4.4.0 envlist = lint test - py313-plone62 - py312-plone62 - py311-plone62 - py310-plone62 - py313-plone61 - py312-plone61 - py311-plone61 - py310-plone61 py313-plone60 py312-plone60 py311-plone60 py310-plone60 - py39-plone60 + py313-plone61 + py312-plone61 + py311-plone61 + py310-plone61 dependencies ## # Add extra configuration options in .meta.toml: # - to specify a custom testing combination of Plone and python versions, use `test_matrix` +# Use ["*"] to use all supported Python versions for this Plone version. # - to specify extra custom environments, use `envlist_lines` # - to specify extra `tox` top-level options, use `config_lines` # [tox] -# test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["3.10", "3.9"]} +# test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["*"]} # envlist_lines = """ # my_other_environment # """ @@ -118,9 +114,8 @@ set_env = ## deps = {[test_runner]deps} - plone62: -c https://dist.plone.org/release/6.2-dev/constraints.txt - plone61: -c https://dist.plone.org/release/6.1-dev/constraints.txt plone60: -c https://dist.plone.org/release/6.0-dev/constraints.txt + plone61: -c https://dist.plone.org/release/6.1-dev/constraints.txt ## # Specify additional deps in .meta.toml: @@ -160,7 +155,7 @@ constrain_package_deps = {[base]constrain_package_deps} set_env = {[base]set_env} deps = {[test_runner]deps} - -c https://dist.plone.org/release/6.2-dev/constraints.txt + -c https://dist.plone.org/release/6.0-dev/constraints.txt commands = {[test_runner]test} extras = {[base]extras} @@ -186,7 +181,7 @@ set_env = {[base]set_env} deps = {[test_runner]deps} coverage - -c https://dist.plone.org/release/6.2-dev/constraints.txt + -c https://dist.plone.org/release/6.0-dev/constraints.txt commands = {[test_runner]coverage} extras = {[base]extras} @@ -199,8 +194,7 @@ deps = twine build towncrier - -c https://dist.plone.org/release/6.2-dev/constraints.txt - + -c https://dist.plone.org/release/6.0-dev/constraints.txt commands = # fake version to not have to install the package # we build the change log as news entries might break @@ -230,8 +224,7 @@ allowlist_externals = deps = pipdeptree pipforester - -c https://dist.plone.org/release/6.2-dev/constraints.txt - + -c https://dist.plone.org/release/6.0-dev/constraints.txt commands = # Generate the full dependency tree sh -c 'pipdeptree -j > forest.json'