From 90654198ef9a624d4216e41b1639993d36ea5cc6 Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Fri, 28 Nov 2025 14:10:19 +0100 Subject: [PATCH 1/3] - testbed for trusted publishing See PR at https://github.com/zopefoundation/meta/pull/374 --- .editorconfig | 6 +++--- .github/workflows/pre-commit.yml | 6 +++--- .github/workflows/tests.yml | 18 ++++++++++-------- .gitignore | 4 ++-- .manylinux-install.sh | 4 ++-- .manylinux.sh | 4 ++-- .meta.toml | 6 +++--- .pre-commit-config.yaml | 4 ++-- CONTRIBUTING.md | 4 ++-- MANIFEST.in | 4 ++-- pyproject.toml | 9 +++++---- setup.cfg | 4 ++-- tox.ini | 4 ++-- 13 files changed, 40 insertions(+), 37 deletions(-) diff --git a/.editorconfig b/.editorconfig index 5094013..e62eec2 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/c-code +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/c-code # # EditorConfig Configuration file, for more details see: # https://EditorConfig.org @@ -12,7 +12,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 8f2ad3c..c0f89ee 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/c-code +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/c-code name: pre-commit on: @@ -21,7 +21,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 52bb52c..21e20ba 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/c-code +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/c-code ### # Initially copied from # https://github.com/actions/starter-workflows/blob/main/ci/python-package.yml @@ -106,7 +106,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: persist-credentials: false - name: Set up Python ${{ matrix.python-version }} @@ -262,7 +262,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: persist-credentials: false - name: Set up Python ${{ matrix.python-version }} @@ -378,7 +378,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: persist-credentials: false - name: Set up Python ${{ matrix.python-version }} @@ -456,7 +456,7 @@ jobs: python-version: "3.13" steps: - name: checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: persist-credentials: false - name: Set up Python ${{ matrix.python-version }} @@ -539,8 +539,12 @@ jobs: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') # Wait for both build jobs to complete needs: [build-package, manylinux] + environment: + name: pypi + url: https://pypi.org/p/ExtensionClass permissions: contents: read + id-token: write # Mandatory for trusted publishing steps: - name: Download all wheel artifacts @@ -570,8 +574,6 @@ jobs: - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: - user: __token__ - password: ${{ secrets.TWINE_PASSWORD }} skip-existing: true packages-dir: dist/ verbose: true diff --git a/.gitignore b/.gitignore index 6e5e8ef..07212fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/c-code +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/c-code *.dll *.egg-info/ *.profraw diff --git a/.manylinux-install.sh b/.manylinux-install.sh index f2dee1c..47ef951 100755 --- a/.manylinux-install.sh +++ b/.manylinux-install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/c-code +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/c-code set -e -x diff --git a/.manylinux.sh b/.manylinux.sh index ea4ef41..77f3c74 100755 --- a/.manylinux.sh +++ b/.manylinux.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/c-code +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/c-code set -e -x diff --git a/.meta.toml b/.meta.toml index 5575419..4badfec 100644 --- a/.meta.toml +++ b/.meta.toml @@ -1,8 +1,8 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/c-code +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/c-code [meta] template = "c-code" -commit-id = "9fcd3d67" +commit-id = "780d7481" [python] with-windows = true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2a52c5c..e120a3d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/c-code +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/c-code minimum_pre_commit_version: '3.6' repos: - repo: https://github.com/pycqa/isort diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5242e6a..bab7f94 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing to zopefoundation projects diff --git a/MANIFEST.in b/MANIFEST.in index b4ca4f0..a5a95df 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/c-code +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/c-code include *.md include *.rst include *.txt diff --git a/pyproject.toml b/pyproject.toml index 8cbcdc4..3fcbbe1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,5 @@ -# -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/c-code +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/c-code [build-system] requires = [ @@ -13,7 +12,6 @@ build-backend = "setuptools.build_meta" name = "ExtensionClass" version = "6.3.dev0" description = "Metaclass for subclassable extension types" -readme = "README.rst" requires-python = ">=3.10" license = "ZPL-2.1" authors = [ @@ -79,3 +77,6 @@ source = [ ".tox/*/lib/python*/site-packages/", ".tox/pypy*/site-packages/", ] + +[tool.setuptools.dynamic] +readme = {file = ["README.rst", "CHANGES.rst"]} diff --git a/setup.cfg b/setup.cfg index 28848f0..38a6e41 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/c-code +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/c-code [zest.releaser] create-wheel = no diff --git a/tox.ini b/tox.ini index 4aa3acc..96c432b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ -# Generated from: -# https://github.com/zopefoundation/meta/tree/master/config/c-code +# Generated with zope.meta (https://zopemeta.readthedocs.io/) from: +# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/c-code [tox] minversion = 4.0 envlist = From 7e85bd971b39bf091ef8b1a51f61ac0ba600a6db Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Fri, 28 Nov 2025 14:17:23 +0100 Subject: [PATCH 2/3] - prepare test release 6.2.1a1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3fcbbe1..70ef084 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ build-backend = "setuptools.build_meta" [project] name = "ExtensionClass" -version = "6.3.dev0" +version = "6.2.1a1" description = "Metaclass for subclassable extension types" requires-python = ">=3.10" license = "ZPL-2.1" From 8e42083ab74e65b33103c79faa982804e98956c6 Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Fri, 28 Nov 2025 14:49:11 +0100 Subject: [PATCH 3/3] - prepare release 6.2.1a2, fix package description --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 70ef084..53f0400 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ build-backend = "setuptools.build_meta" [project] name = "ExtensionClass" -version = "6.2.1a1" +version = "6.2.1a2" description = "Metaclass for subclassable extension types" requires-python = ">=3.10" license = "ZPL-2.1" @@ -37,6 +37,7 @@ classifiers = [ "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", ] +dynamic = ["readme"] dependencies = [] [project.optional-dependencies]