From 0bd1efc22fa0d40cb46812e579216a5197200adb Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Fri, 20 Mar 2026 12:08:15 +0100 Subject: [PATCH 1/4] Configuring with plone.meta --- .editorconfig | 2 +- .flake8 | 2 +- .github/dependabot.yml | 2 +- .github/workflows/meta.yml | 10 ++-------- .github/workflows/test-matrix.yml | 29 +++++++++++------------------ .gitignore | 2 +- .meta.toml | 4 ++-- .pre-commit-config.yaml | 2 +- news/+meta.internal | 2 ++ pyproject.toml | 4 +++- tox.ini | 2 +- 11 files changed, 26 insertions(+), 35 deletions(-) create mode 100644 news/+meta.internal diff --git a/.editorconfig b/.editorconfig index d054af1..55bfb6d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,5 @@ # Generated from: -# https://github.com/plone/meta/tree/main/src/plone/meta/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: diff --git a/.flake8 b/.flake8 index 3e2d35f..ff17672 100644 --- a/.flake8 +++ b/.flake8 @@ -1,5 +1,5 @@ # Generated from: -# https://github.com/plone/meta/tree/main/src/plone/meta/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 diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e5e4522..8da3888 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,5 +1,5 @@ # Generated from: -# https://github.com/plone/meta/tree/main/src/plone/meta/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 version: 2 updates: diff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml index f9a346f..df9c753 100644 --- a/.github/workflows/meta.yml +++ b/.github/workflows/meta.yml @@ -1,16 +1,10 @@ # Generated from: -# https://github.com/plone/meta/tree/main/src/plone/meta/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 + on: push: - branches: - - master - - main - pull_request: - branches: - - master - - main workflow_dispatch: ## diff --git a/.github/workflows/test-matrix.yml b/.github/workflows/test-matrix.yml index 8b2da2b..9b2c4c7 100644 --- a/.github/workflows/test-matrix.yml +++ b/.github/workflows/test-matrix.yml @@ -1,10 +1,11 @@ # Generated from: -# https://github.com/plone/meta/tree/main/src/plone/meta/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: Tests on: push: + workflow_dispatch: jobs: build: @@ -29,11 +30,15 @@ jobs: - uses: actions/checkout@v6 with: persist-credentials: false - - name: Set up Python - uses: actions/setup-python@v6 + - name: Install uv + caching + uses: astral-sh/setup-uv@v7.5.0 with: + enable-cache: true + cache-dependency-glob: | + setup.* + tox.ini + pyproject.toml python-version: ${{ matrix.config[0] }} - allow-prereleases: true ## # Add extra configuration options in .meta.toml: @@ -42,25 +47,13 @@ jobs: # _your own configuration lines_ # """ ## - - name: Pip cache - uses: actions/cache@v5 - 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 + if [ `tox list --no-desc -f init|wc -l` = 1 ]; then uvx --with tox-uv tox -e init;else true; fi - name: Test - run: tox -e ${{ matrix.config[2] }} + run: uxv --with tox-uv tox -e ${{ matrix.config[2] }} ## diff --git a/.gitignore b/.gitignore index a602abe..70377bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # Generated from: -# https://github.com/plone/meta/tree/main/src/plone/meta/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 diff --git a/.meta.toml b/.meta.toml index ed2ab61..be02eaa 100644 --- a/.meta.toml +++ b/.meta.toml @@ -1,9 +1,9 @@ # Generated from: -# https://github.com/plone/meta/tree/main/src/plone/meta/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 = "2.5.1" +commit-id = "2.6.1.dev0" [tox] test_matrix = {"6.2" = ["*"]} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2e8482b..3be5f7a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ # Generated from: -# https://github.com/plone/meta/tree/main/src/plone/meta/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 diff --git a/news/+meta.internal b/news/+meta.internal new file mode 100644 index 0000000..c08f539 --- /dev/null +++ b/news/+meta.internal @@ -0,0 +1,2 @@ +Update configuration files. +[plone devs] diff --git a/pyproject.toml b/pyproject.toml index 4c9132e..d6d4b32 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,11 @@ # Generated from: -# https://github.com/plone/meta/tree/main/src/plone/meta/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>=68.2,<83", "wheel"] + + [tool.towncrier] directory = "news/" filename = "CHANGES.rst" diff --git a/tox.ini b/tox.ini index a381220..4ea737a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ # Generated from: -# https://github.com/plone/meta/tree/main/src/plone/meta/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 [tox] # We need 4.4.0 for constrain_package_deps. From 11ae3480f5a3ae3759ed3b5ae745fa913b10b860 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Fri, 20 Mar 2026 12:32:59 +0100 Subject: [PATCH 2/4] Configuring with plone.meta --- .github/workflows/test-matrix.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-matrix.yml b/.github/workflows/test-matrix.yml index 9b2c4c7..cd5760c 100644 --- a/.github/workflows/test-matrix.yml +++ b/.github/workflows/test-matrix.yml @@ -32,6 +32,7 @@ jobs: persist-credentials: false - name: Install uv + caching uses: astral-sh/setup-uv@v7.5.0 + id: setup_uv with: enable-cache: true cache-dependency-glob: | @@ -51,9 +52,9 @@ jobs: # 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 uvx --with tox-uv tox -e init;else true; fi + if [ `tox list --no-desc -f init|wc -l` = 1 ]; then ${{ steps.setup_uv.uvx-path }} --with tox-uv tox -e init;else true; fi - name: Test - run: uxv --with tox-uv tox -e ${{ matrix.config[2] }} + run: ${{ steps.setup_uv.uvx-path }} --with tox-uv tox -e ${{ matrix.config[2] }} ## From 208ff83560dfbf5d2148a70266e6289817d1fe08 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Fri, 20 Mar 2026 12:40:02 +0100 Subject: [PATCH 3/4] test --- .github/workflows/test-matrix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-matrix.yml b/.github/workflows/test-matrix.yml index cd5760c..811f27c 100644 --- a/.github/workflows/test-matrix.yml +++ b/.github/workflows/test-matrix.yml @@ -52,9 +52,9 @@ jobs: # 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 ${{ steps.setup_uv.uvx-path }} --with tox-uv tox -e init;else true; fi + if [ `tox list --no-desc -f init|wc -l` = 1 ]; then ${{ steps.setup_uv.outputs['uvx-path'] }} --with tox-uv tox -e init;else true; fi - name: Test - run: ${{ steps.setup_uv.uvx-path }} --with tox-uv tox -e ${{ matrix.config[2] }} + run: ${{ steps.setup_uv.outputs['uvx-path'] }} --with tox-uv tox -e ${{ matrix.config[2] }} ## From 7cf903e0577f1906afcfac411eb8dfd1b5fc8701 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Fri, 20 Mar 2026 12:42:27 +0100 Subject: [PATCH 4/4] test --- .github/workflows/test-matrix.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-matrix.yml b/.github/workflows/test-matrix.yml index 811f27c..53667a3 100644 --- a/.github/workflows/test-matrix.yml +++ b/.github/workflows/test-matrix.yml @@ -55,6 +55,8 @@ jobs: if [ `tox list --no-desc -f init|wc -l` = 1 ]; then ${{ steps.setup_uv.outputs['uvx-path'] }} --with tox-uv tox -e init;else true; fi - name: Test run: ${{ steps.setup_uv.outputs['uvx-path'] }} --with tox-uv tox -e ${{ matrix.config[2] }} + - name: Test + run: uvx --with tox-uv tox -e ${{ matrix.config[2] }} ##