10000 Merge branch 'main' into pre-commit-ci-update-config · python/blurb@2b05988 · GitHub
[go: up one dir, main page]

Skip to content

Commit 2b05988

Browse files
authored
Merge branch 'main' into pre-commit-ci-update-config
2 parents 05db92d + e7c9429 commit 2b05988

File tree

3 files changed

+18
-27
lines changed

3 files changed

+18
-27
lines changed

.github/release.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
changelog:
2+
exclude:
3+
authors:
4+
- dependabot
5+
- pre-commit-ci

README.md

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -191,32 +191,6 @@ uses the name of the directory CPython is checked out to.
191191
version I'm releasing, and using this shortcut saves me some typing.)
192192

193193

194-
### blurb split
195-
196-
`blurb split` only needs to be run once per-branch, ever.
197-
It reads in `Misc/NEWS`
198-
and splits it into individual `.rst` files.
199-
The text files are stored as follows::
200-
201-
Misc/NEWS.d/<version>.rst
202-
203-
`<version>` is the version number of Python where the
204-
change was committed. Pre-release versions are denoted
205-
with an abbreviation: `a` for alphas, `b` for betas,
206-
and `rc` for release candidates.
207-
208-
The individual `<version>.rst` files actually (usually)
209-
contain multiple entries. Each entry is delimited by a
210-
single line containing `..` by itself.
211-
212-
The assumption is, at the point we convert over to *blurb*,
213-
we'll run `blurb split` on each active branch,
214-
remove `Misc/NEWS` from the repo entirely,
215-
never run `blurb split` ever again,
216-
and ride off into the sunset, confident that the world is now
217-
a better place.
218-
219-
220194

221195
## The "next" directory
222196

@@ -239,6 +213,18 @@ part of the cherry-picking process.
239213

240214
## Changelog
241215

216+
### 1.2.0
217+
218+
- Replace spaces with underscores in news directory.
219+
- Drop support for Python 3.7.
220+
- Remove `blurb split` command.
221+
- Replace `gh-issue-NNNN:` with `gh-NNNN:` in the output.
222+
- Accept GitHub issues numbered only 32426 or above.
223+
- Improve error checking when parsing a Blurb.
224+
- Loosen README check for CPython forks.
225+
- Move code from `python/core-workflow` to own `python/blurb` repo.
226+
- Deploy to PyPI via Trusted Publishers.
227+
242228
### 1.1.0
243229

244230
- Support GitHub Issues in addition to b.p.o (bugs.python.org).

RELEASING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Release Checklist
22

33
- [ ] check tests pass on [GitHub Actions](https://github.com/python/blurb/actions)
4-
[![GitHub Actions status](https://github.com/python/blurb/actions/workflows/main.yml/badge.svg)](https://github.com/python/blurb/actions/workflows/main.yml)
4+
[![GitHub Actions status](https://github.com/python/blurb/actions/workflows/test.yml/badge.svg)](https://github.com/python/blurb/actions/workflows/test.yml)
55

66
- [ ] Update [changelog](https://github.com/python/blurb/blob/main/CHANGELOG.md)
77

0 commit comments

Comments
 (0)
0