From 2963db5e4044ce9b7f68d250b104c1a8249c49d7 Mon Sep 17 00:00:00 2001 From: facelessuser Date: Sun, 22 Jun 2025 12:45:29 -0600 Subject: [PATCH 1/2] Use trusted publishing and note Python 3.14 support --- .github/workflows/build.yml | 4 ++-- .github/workflows/deploy.yml | 34 ++++++++++++++++++++++------ docs/src/markdown/about/changelog.md | 1 + hatch_build.py | 1 + pyproject.toml | 2 +- 5 files changed, 32 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b50159a..ec62b54 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,8 +32,8 @@ jobs: - python-version: '3.14' tox-env: py314 exclude: - - platform: windows-latest - python-version: '3.14' + # - platform: windows-latest + # python-version: '3.14' env: TOXENV: ${{ matrix.tox-env }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 453219c..b207622 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -36,20 +36,40 @@ jobs: python -m mkdocs gh-deploy -v --clean --remote-name gh-token git push gh-token gh-pages - pypi: + build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: 3.13 - - name: Package + - name: Build run: | - pip install --upgrade wheel build + pip install --upgrade pip build python -m build -s -w - - name: Publish + - name: Store the distribution packages + uses: actions/upload-artifact@v4 + with: + name: python-package-distributions + path: dist/ + + pypi-publish: + needs: + - build + runs-on: ubuntu-latest + environment: pypi + permissions: + # IMPORTANT: this permission is mandatory for Trusted Publishing + id-token: write + + steps: + - name: Download all the dists + uses: actions/download-artifact@v4 + with: + name: python-package-distributions + path: dist/ + - name: Publish distribution uses: pypa/gh-action-pypi-publish@release/v1 with: - user: __token__ - password: ${{ secrets.PYPI_PWD }} + print-hash: true diff --git a/docs/src/markdown/about/changelog.md b/docs/src/markdown/about/changelog.md index 33d9c4b..87b6ca8 100644 --- a/docs/src/markdown/about/changelog.md +++ b/docs/src/markdown/about/changelog.md @@ -3,6 +3,7 @@ ## 10.1 - **NEW**: Drop support for Python 3.8 which is "end of life". +- **NEW**: Add support for Python 3.14. - **NEW**: Add `wcmatch.glob.compile(pattern)` and `wcmatch.fnmatch.compile(pattern)` to allow for precompiled matcher objects that can be reused. diff --git a/hatch_build.py b/hatch_build.py index 826f56f..9b9db6a 100644 --- a/hatch_build.py +++ b/hatch_build.py @@ -33,6 +33,7 @@ def update(self, metadata): 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', 'Programming Language :: Python :: 3.13', + 'Programming Language :: Python :: 3.14', 'Topic :: Software Development :: Libraries :: Python Modules', 'Typing :: Typed' ] diff --git a/pyproject.toml b/pyproject.toml index 6a72f10..488226a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -113,7 +113,7 @@ legacy_tox_ini = """ isolated_build = true skipsdist=true envlist= - py39,py310,py311,py312,py313, + py39,py310,py311,py312,py313,py314, lint [testenv] From 1bcf220db1d122ae8615ab90fb26518e2857335a Mon Sep 17 00:00:00 2001 From: facelessuser Date: Sun, 22 Jun 2025 12:47:12 -0600 Subject: [PATCH 2/2] Fix build yml --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec62b54..d9301fc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,9 +31,9 @@ jobs: tox-env: py313 - python-version: '3.14' tox-env: py314 - exclude: - # - platform: windows-latest - # python-version: '3.14' + # exclude: + # - platform: windows-latest + # python-version: '3.14' env: TOXENV: ${{ matrix.tox-env }}