Merge branch 'main' into ci-optional-3.13

Author: ezio-melotti

.github/release.yml

@@ -0,0 +1,5 @@
+changelog:
+  exclude:
+    authors:
+      - dependabot
+      - pre-commit-ci

.github/workflows/lint.yml

@@ -14,8 +14,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - uses: actions/setup-python@v5
         with:
           python-version: "3.x"
-          cache: pip
-      - uses: pre-commit/[email protected]
+      - uses: tox-dev/action-pre-commit-uv@v1

.github/workflows/release.yml

@@ -11,6 +11,9 @@ on:
 permissions:
   contents: read
 
+env:
+  FORCE_COLOR: 1
+
 jobs:
   # Always build & lint package.
   build-package:
@@ -21,6 +24,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          persist-credentials: false
 
       - uses: hynek/build-and-inspect-python-package@v2
 

.github/workflows/test.yml

@@ -2,6 +2,9 @@ name: Test
 
 on: [push, pull_request, workflow_dispatch]
 
+permissions:
+  contents: read
+
 env:
   FORCE_COLOR: 1
 
@@ -12,35 +15,33 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         experimental: [false]
         include:
-          - python-version: "3.13"
+          - python-version: "3.14"
             experimental: true
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
-          cache: pip
 
-      - name: Install dependencies
-        run: |
-          python --version
-          python -m pip install -U pip
-          python -m pip install -U tox
+      - name: Install uv
+        uses: hynek/setup-cached-uv@v2
 
       - name: Tox tests
         continue-on-error: ${{ matrix.experimental }}
         run: |
-          tox -e py
+          uvx --with tox-uv tox -e py
 
       - name: Upload coverage
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           flags: ${{ matrix.python-version }}
           name: Python ${{ matrix.python-version }}

.gitignore

@@ -90,3 +90,6 @@ ENV/
 
 # pytest
 .pytest_cache/
+
+# hatch-vcs
+src/*/_version.py

.pre-commit-config.yaml

@@ -1,28 +1,40 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
+      - id: check-added-large-files
       - id: check-case-conflict
       - id: check-merge-conflict
       - id: check-toml
       - id: check-yaml
       - id: debug-statements
       - id: end-of-file-fixer
+      - id: forbid-submodules
       - id: trailing-whitespace
 
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.29.2
+    hooks:
+      - id: check-dependabot
+      - id: check-github-workflows
+
+  - repo: https://github.com/rhysd/actionlint
+    rev: v1.7.2
+    hooks:
+      - id: actionlint
+
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: 1.7.0
+    rev: 2.2.4
     hooks:
       - id: pyproject-fmt
-        additional_dependencies: [tox]
 
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.16
+    rev: v0.20.2
     hooks:
       - id: validate-pyproject
 
   - repo: https://github.com/tox-dev/tox-ini-fmt
-    rev: 1.3.1
+    rev: 1.4.1
     hooks:
       - id: tox-ini-fmt
 

CHANGELOG.md

@@ -0,0 +1,42 @@
+# Changelog
+
+## 1.3.0
+
+* Add support for Python 3.13 by @hugovk in https://github.com/python/blurb/pull/26
+* Drop support for Python 3.8 by @hugovk in https://github.com/python/blurb/pull/27
+* Generate digital attestations for PyPI (PEP 740) by @hugovk in https://github.com/python/blurb/pull/28
+* Allow running blurb test from blurb-* directories by @hroncok in https://github.com/python/blurb/pull/24
+* Add `version` subcommand by @hugovk in https://github.com/python/blurb/pull/29
+* Generate `__version__` at build to avoid slow `importlib.metadata` import by @hugovk in https://github.com/python/blurb/pull/30
+
+## 1.2.1
+
+- Fix `python3 -m blurb`.
+- Undocument removed `blurb split`.
+
+## 1.2.0
+
+- Replace spaces with underscores in news directory.
+- Drop support for Python 3.7.
+- Remove `blurb split` command.
+- Replace `gh-issue-NNNN:` with `gh-NNNN:` in the output.
+- Accept GitHub issues numbered only 32426 or above.
+- Improve error checking when parsing a Blurb.
+- Loosen README check for CPython forks.
+- Move code from `python/core-workflow` to own `python/blurb` repo.
+- Deploy to PyPI via Trusted Publishers.
+
+## 1.1.0
+
+- Support GitHub Issues in addition to b.p.o (bugs.python.org).
+  If `gh-issue` is in the metadata, then the filename will contain
+  `gh-issue-<number>` instead of `bpo-`.
+
+## 1.0.7
+
+- When word wrapping, don't break on long words or hyphens.
+- Use the `-f` flag when adding **blurb** files to a Git
+  commit.  This forces them to be added, even when the files
+  might normally be ignored based on a `.gitignore` directive.
+- Explicitly support the `-help` command-line option.
+- Fix Travis CI integration.

LICENSE.txt

@@ -1,4 +1,3 @@
-blurb version 1.0
 Part of the blurb package.
 Copyright 2015-2018 by Larry Hastings
 

README.md

@@ -26,8 +26,6 @@ and automatically uses the correct file paths.
 You can install **blurb** from PyPI using `pip`.  Alternatively,
 simply add `blurb` to a directory on your path.
 
-**blurb**'s only dependency is Python 3.8+.
-
 
 ## Files used by blurb
 
@@ -191,32 +189,6 @@ uses the name of the directory CPython is checked out to.
 version I'm releasing, and using this shortcut saves me some typing.)
 
 
-### blurb split
-
-`blurb split` only needs to be run once per-branch, ever.
-It reads in `Misc/NEWS`
-and splits it into individual `.rst` files.
-The text files are stored as follows::
-
-    Misc/NEWS.d/<version>.rst
-
-`<version>` is the version number of Python where the
-change was committed.  Pre-release versions are denoted
-with an abbreviation: `a` for alphas, `b` for betas,
-and `rc` for release candidates.
-
-The individual `<version>.rst` files actually (usually)
-contain multiple entries.  Each entry is delimited by a
-single line containing `..` by itself.
-
-The assumption is, at the point we convert over to *blurb*,
-we'll run `blurb split` on each active branch,
-remove `Misc/NEWS` from the repo entirely,
-never run `blurb split` ever again,
-and ride off into the sunset, confident that the world is now
-a better place.
-
-
 
 ## The "next" directory
 
@@ -237,24 +209,11 @@ the right thing.  If `NEWS` entries were already written to the
 final version directory, you'd have to move those around as
 part of the cherry-picking process.
 
-## Changelog
-
-### 1.1.0
-
-- Support GitHub Issues in addition to b.p.o (bugs.python.org).
-  If "gh-issue" is in the metadata, then the filename will contain
-  "gh-issue-<number>" instead of "bpo-".
-
-### 1.0.7
-
-- When word wrapping, don't break on long words or hyphens.
-- Use the `-f` flag when adding **blurb** files to a Git
-  commit.  This forces them to be added, even when the files
-  might normally be ignored based on a `.gitignore` directive.
-- Explicitly support the `-help` command-line option.
-- Fix Travis CI integration.
-
 ## Copyright
 
 **blurb** is Copyright 2015-2018 by Larry Hastings.
 Licensed to the PSF under a contributor agreement.
+
+## Changelog
+
+See [CHANGELOG.md](CHANGELOG.md).

RELEASING.md

@@ -1,7 +1,7 @@
 # Release Checklist
 
 - [ ] check tests pass on [GitHub Actions](https://github.com/python/blurb/actions)
-      [![GitHub Actions status](https://github.com/python/blurb/actions/workflows/main.yml/badge.svg)](https://github.com/python/blurb/actions/workflows/main.yml)
+      [![GitHub Actions status](https://github.com/python/blurb/actions/workflows/test.yml/badge.svg)](https://github.com/python/blurb/actions/workflows/test.yml)
 
 - [ ] Update [changelog](https://github.com/python/blurb/blob/main/CHANGELOG.md)