Merge branch 'main' into add-gh-flags

.github/workflows/test.yml

@@ -11,9 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Temporarily remove 3.13 pending:
-        # https://github.com/pytest-dev/pyfakefs/issues/1017
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v4

CHANGELOG.md

@@ -0,0 +1,33 @@
+# Changelog
+
+## 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.

README.md

@@ -228,39 +228,12 @@ 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.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.
-- Add the `-i/--issue` and `-s/--section` options to the `add` command.
-  This lets you pre-fill the `gh-issue` and `section` fields.
-  in the template.
-
-### 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).

pyproject.toml

@@ -35,7 +35,7 @@ optional-dependencies.tests = [
   "pytest",
   "pytest-cov",
 ]
-urls.Changelog = "https://github.com/python/blurb/blob/main/README.md#changelog"
+urls.Changelog = "https://github.com/python/blurb/blob/main/CHANGELOG.md"
 urls.Homepage = "https://github.com/python/blurb"
 urls.Source = "https://github.com/python/blurb"
 scripts.blurb = "blurb.blurb:main"

src/blurb/__main__.py

@@ -1,5 +1,5 @@
-"""Run blurb using `python3 blurb/`."""
-import blurb
+"""Run blurb using ``python3 -m blurb``."""
+from blurb import blurb
 
 
 if __name__ == '__main__':

tox.ini

@@ -19,3 +19,5 @@ commands =
       {posargs}
     blurb test
     blurb help
+    {envpython} -I -m blurb test
+    {envpython} -I -m blurb help