From 9b54fc9c086a6ab0e5e13b9de350f0db5511d837 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Wed, 17 Jul 2024 11:01:31 +0300
Subject: [PATCH 1/3] Move changelog to own file

---
 CHANGELOG.md   | 28 ++++++++++++++++++++++++++++
 README.md      | 33 ++++-----------------------------
 pyproject.toml |  2 +-
 3 files changed, 33 insertions(+), 30 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..364e743
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,28 @@
+# 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.
+
+## 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.
diff --git a/README.md b/README.md
index 9dd8ffe..d477343 100644
--- a/README.md
+++ b/README.md
@@ -211,36 +211,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.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.
-
 ## Copyright
 
 **blurb** is Copyright 2015-2018 by Larry Hastings.
 Licensed to the PSF under a contributor agreement.
+
+## Changelog
+
+See [CHANGELOG.md](CHANGELOG.md).
diff --git a/pyproject.toml b/pyproject.toml
index 35c7dd9..0843f61 100644
--- a/pyproject.toml
+++ b/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"

From c79ec986e52f5d73952f0f2e55de9dce73b13470 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Wed, 17 Jul 2024 11:02:07 +0300
Subject: [PATCH 2/3] Prepare 1.2.1 release

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 364e743..f15c356 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.1
+
+- Fix `python3 -m blurb`.
+- Undocument removed `blurb split`.
+
 ## 1.2.0
 
 - Replace spaces with underscores in news directory.

From 025766dcce03bc743b8a4b96cfb7a08ca054f77f Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Wed, 17 Jul 2024 14:29:49 +0300
Subject: [PATCH 3/3] Improve formatting

Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f15c356..4783afd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,8 +20,8 @@
 ## 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-".
+  If `gh-issue` is in the metadata, then the filename will contain
+  `gh-issue-<number>` instead of `bpo-`.
 
 ## 1.0.7