diff --git a/.editorconfig b/.editorconfig index d054af15..55bfb6d0 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 3e2d35f9..ff176722 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 e5e4522d..8da3888c 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 f9a346ff..df9c7536 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 8b2da2b5..de946281 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@v8.0.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 [ `uvx 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: uvx --with tox-uv tox -e ${{ matrix.config[2] }} ## diff --git a/.gitignore b/.gitignore index a602abea..70377bd6 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 5c153587..14731775 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.8.0" [pyproject] dependencies_ignores = "['Products.LinguaPlone.interfaces.ITranslatable', 'collective.akismet', 'collective.z3cform.norobots', 'plone.formwidget.captcha', 'plone.formwidget.recaptcha', 'plone.formwidget.hcaptcha', 'plone.contentrules', 'plone.app.contentrules', 'plone.restapi', 'plone.stringinterp', 'plone.app.collection']" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2e8482be..fd9a409a 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 @@ -16,7 +16,7 @@ repos: hooks: - id: isort - repo: https://github.com/psf/black-pre-commit-mirror - rev: 26.1.0 + rev: 26.3.1 hooks: - id: black - repo: https://github.com/collective/zpretty @@ -44,7 +44,7 @@ repos: # """ ## - repo: https://github.com/codespell-project/codespell - rev: v2.4.1 + rev: v2.4.2 hooks: - id: codespell additional_dependencies: @@ -69,7 +69,7 @@ repos: rev: "0.24.0" hooks: - id: check-python-versions - args: ['--only', 'setup.py,pyproject.toml'] + args: ['--only', 'setup.py,tox.ini'] - repo: https://github.com/collective/i18ndude rev: "6.3.0" hooks: diff --git a/pyproject.toml b/pyproject.toml index 6e826f8e..9a2a725e 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/setup.py b/setup.py index cbde036e..668f5610 100644 --- a/setup.py +++ b/setup.py @@ -27,6 +27,8 @@ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", ], keywords="plone discussion", author="Timo Stollenwerk - Plone Foundation", diff --git a/tox.ini b/tox.ini index 635b7c28..1cf07aae 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. @@ -64,10 +64,9 @@ description = check if the package defines all its dependencies skip_install = true deps = build - setuptools<82.0.0 - z3c.dependencychecker==2.14.3 + z3c.dependencychecker==3.0 commands = - python -m build --sdist + python -m build --wheel dependencychecker [testenv:dependencies-graph]