From a14f56f618447037b3a31b86bfa3ca3800e46ca3 Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Sat, 28 Mar 2026 12:05:31 +0100 Subject: [PATCH 1/2] - update to latest zope.meta templates --- .editorconfig | 8 +++++--- .github/workflows/pre-commit.yml | 8 +++++--- .github/workflows/tests.yml | 16 +++++++--------- .gitignore | 7 +++++-- .meta.toml | 9 ++++++--- .pre-commit-config.yaml | 11 +++++++---- .readthedocs.yaml | 6 ++++-- CONTRIBUTING.md | 6 ++++-- MANIFEST.in | 6 ++++-- pyproject.toml | 4 ++++ setup.cfg | 6 ++++-- tox.ini | 6 ++++-- 12 files changed, 59 insertions(+), 34 deletions(-) diff --git a/.editorconfig b/.editorconfig index ce35108..2b173c9 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,7 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/zope-product +# DO NOT EDIT THIS FILE BY HAND. Generated with +# zope.meta (https://zopemeta.readthedocs.io/) from templates in +# https://github.com/dataflake/meta/tree/master/zope-product and +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/zope-product # # EditorConfig Configuration file, for more details see: # https://EditorConfig.org @@ -12,7 +14,7 @@ root = true -[*] # For All Files +[*] # Unix-style newlines with a newline ending every file end_of_line = lf insert_final_newline = true diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index cf37dd3..d235c5b 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -1,5 +1,7 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/zope-product +# DO NOT EDIT THIS FILE BY HAND. Generated with +# zope.meta (https://zopemeta.readthedocs.io/) from templates in +# https://github.com/dataflake/meta/tree/master/zope-product and +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/zope-product name: pre-commit on: @@ -21,7 +23,7 @@ jobs: name: linting runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: actions/setup-python@v6 with: python-version: '3.13' diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5a47ddb..a09469b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,5 +1,7 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/zope-product +# DO NOT EDIT THIS FILE BY HAND. Generated with +# zope.meta (https://zopemeta.readthedocs.io/) from templates in +# https://github.com/dataflake/meta/tree/master/zope-product and +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/zope-product name: tests on: @@ -36,12 +38,12 @@ jobs: 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: Install uv + caching - # astral/setup-uv@7.1.3 - uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 + # astral/setup-uv@7.6.0 + uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 with: enable-cache: true cache-dependency-glob: | @@ -50,11 +52,7 @@ jobs: python-version: ${{ matrix.config[0] }} github-token: ${{ secrets.GITHUB_TOKEN }} - name: Test - if: ${{ !startsWith(runner.os, 'Mac') }} run: uvx --with tox-uv tox -e ${{ matrix.config[1] }} - - name: Test (macOS) - if: ${{ startsWith(runner.os, 'Mac') }} - run: uvx --with tox-uv tox -e ${{ matrix.config[1] }}-universal2 - name: Coverage if: matrix.config[1] == 'coverage' run: | diff --git a/.gitignore b/.gitignore index ce7f677..fe457bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/zope-product +# DO NOT EDIT THIS FILE BY HAND. Generated with +# zope.meta (https://zopemeta.readthedocs.io/) from templates in +# https://github.com/dataflake/meta/tree/master/zope-product and +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/zope-product *.dll *.egg-info/ *.profraw @@ -28,5 +30,6 @@ lib64 log/ parts/ pyvenv.cfg +share/ testing.log var/ diff --git a/.meta.toml b/.meta.toml index ab15d8e..61c146d 100644 --- a/.meta.toml +++ b/.meta.toml @@ -1,8 +1,10 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/zope-product +# DO NOT EDIT THIS FILE BY HAND. Generated with +# zope.meta (https://zopemeta.readthedocs.io/) from templates in +# https://github.com/dataflake/meta/tree/master/zope-product and +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/zope-product [meta] template = "zope-product" -commit-id = "9fcd3d67" +commit-id = "d21f9691" [python] with-windows = false @@ -11,6 +13,7 @@ with-future-python = false with-docs = true with-sphinx-doctests = false with-macos = false +with-free-threaded-python = false [tox] use-flake8 = true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cdeaf6c..0e25b30 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,9 +1,11 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/zope-product +# DO NOT EDIT THIS FILE BY HAND. Generated with +# zope.meta (https://zopemeta.readthedocs.io/) from templates in +# https://github.com/dataflake/meta/tree/master/zope-product and +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/zope-product minimum_pre_commit_version: '3.6' repos: - repo: https://github.com/pycqa/isort - rev: "7.0.0" + rev: "8.0.1" hooks: - id: isort - repo: https://github.com/hhatto/autopep8 @@ -12,7 +14,7 @@ repos: - id: autopep8 args: [--in-place, --aggressive, --aggressive] - repo: https://github.com/asottile/pyupgrade - rev: v3.21.0 + rev: v3.21.2 hooks: - id: pyupgrade args: [--py310-plus] @@ -20,6 +22,7 @@ repos: rev: 0.4.3 hooks: - id: teyit + language_version: python3.13 - repo: https://github.com/PyCQA/flake8 rev: "7.3.0" hooks: diff --git a/.readthedocs.yaml b/.readthedocs.yaml index ecff5e7..f4765f7 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,5 +1,7 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/zope-product +# DO NOT EDIT THIS FILE BY HAND. Generated with +# zope.meta (https://zopemeta.readthedocs.io/) from templates in +# https://github.com/dataflake/meta/tree/master/zope-product and +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/zope-product # Read the Docs configuration file # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bbf4194..fbc1bd1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,8 @@ # Contributing to dataflake projects diff --git a/MANIFEST.in b/MANIFEST.in index 3a7a0ff..1ed8135 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,7 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/zope-product +# DO NOT EDIT THIS FILE BY HAND. Generated with +# zope.meta (https://zopemeta.readthedocs.io/) from templates in +# https://github.com/dataflake/meta/tree/master/zope-product and +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/zope-product include *.md include *.rst include *.txt diff --git a/pyproject.toml b/pyproject.toml index 357b7db..5c96e3a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,7 @@ +# DO NOT EDIT THIS FILE BY HAND. Generated with +# zope.meta (https://zopemeta.readthedocs.io/) from templates in +# https://github.com/dataflake/meta/tree/master/zope-product and +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/zope-product # Generated from: # https://github.com/zopefoundation/meta/tree/master/config/zope-product diff --git a/setup.cfg b/setup.cfg index b113116..9b00d91 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,7 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/zope-product +# DO NOT EDIT THIS FILE BY HAND. Generated with +# zope.meta (https://zopemeta.readthedocs.io/) from templates in +# https://github.com/dataflake/meta/tree/master/zope-product and +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/zope-product [flake8] doctests = 1 diff --git a/tox.ini b/tox.ini index d86805f..2ff939d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,7 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/zope-product +# DO NOT EDIT THIS FILE BY HAND. Generated with +# zope.meta (https://zopemeta.readthedocs.io/) from templates in +# https://github.com/dataflake/meta/tree/master/zope-product and +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/zope-product [tox] minversion = 3.18 envlist = From 8dc8abd5ddad42b0b1ce08224ce8b246bf473f22 Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Sat, 28 Mar 2026 12:07:03 +0100 Subject: [PATCH 2/2] - remove duplicate comment --- pyproject.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5c96e3a..4cc079e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,8 +2,6 @@ # zope.meta (https://zopemeta.readthedocs.io/) from templates in # https://github.com/dataflake/meta/tree/master/zope-product and # https://github.com/zopefoundation/meta/tree/master/src/zope/meta/zope-product -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/zope-product [build-system] requires = [