Skip to content

Commit fc975c6

Browse files
Upgrade documentation around the changelog
We do not upgrade the scripts at the same time because we want to avoid conflicts with main and need to merge the file moved for that. Co-authored-by: Jacob Walls <[email protected]>
1 parent 21d71db commit fc975c6

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ To ease the process of reviewing your PR, do make sure to complete the following
2323

2424
## Description
2525

26-
<!-- If this PR reference an issue without fixing it: -->
26+
<!-- If this PR references an issue without fixing it: -->
2727

2828
Refs #XXXX
2929

.pre-commit-config.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,13 @@ repos:
7979
entry: python3 -m script.fix_documentation
8080
language: system
8181
types: [text]
82-
files: ^(ChangeLog|doc/whatsnew/\d+\.\d+\.rst)
82+
files: ^(doc/whatsnew/\d+\.\d+\.rst)
8383
- repo: https://github.com/rstcheck/rstcheck
8484
rev: "v6.0.0rc2"
8585
hooks:
8686
- id: rstcheck
8787
args: ["--report-level=warning"]
88-
types: [text] # necessary to include ChangeLog file
89-
files: ^(ChangeLog|doc/(.*/)*.*\.rst)
88+
files: ^(doc/(.*/)*.*\.rst)
9089
additional_dependencies: [Sphinx==4.5.0]
9190
- repo: https://github.com/pre-commit/mirrors-mypy
9291
rev: v0.950

MANIFEST.in

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ prune examples
66
prune tests
77
prune script
88
exclude .*
9-
exclude ChangeLog
109
exclude Dockerfile
1110
exclude README.rst
1211
exclude pylintrc

doc/development_guide/contributor_guide/contribute.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ of Pylint as it gives you access to the latest ``ast`` parser.
3434

3535
* then run ``pre-commit install`` in the ``pylint`` root directory to enable the git hooks.
3636

37-
- Add a short entry to the ChangeLog describing the change, except for internal
38-
implementation only changes. Not usually required, but for changes other than small
39-
bugs we also add a couple of sentences in the release document for that release,
40-
(`What's New` section). For the release document we usually write some more details,
41-
and it is also a good place to offer examples on how the new change is supposed to work.
37+
- Add a short entry to the change log describing the change, except for internal
38+
implementation only changes.
4239

43-
- Add a short entry in :file:`doc/whatsnew/VERSION.rst`.
40+
- Not usually required, but for changes other than small bugs we also add a couple
41+
of sentences in the release document for that release, (:file:`doc/whatsnew/VERSION.rst`,
42+
`What's New` section). For the release document we usually write some more details,
43+
and it is also a good place to offer examples on how the new change is supposed to work.
4444

4545
- If you used multiple emails or multiple names when contributing, add your mails
4646
and preferred name in the ``script/.contributors_aliases.json`` file.

doc/development_guide/contributor_guide/release.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ the maintenance branch. If so, release a last patch release first. See
1212
date.
1313
- Remove the empty changelog for the last unreleased patch version `X.Y-1.Z'`. (For
1414
example: `v2.3.5`)
15-
- Check the result of `git diff vX.Y-1.Z' ChangeLog`. (For example:
16-
`git diff v2.3.4 ChangeLog`)
15+
- Check the result of `git diff vX.Y-1.Z' doc/whatsnew`. (For example:
16+
`git diff v2.3.4 doc/whatsnew`)
1717
- Install the release dependencies: `pip3 install -r requirements_test.txt`
1818
- Bump the version and release by using `tbump X.Y.0 --no-push --no-tag`. (For example:
1919
`tbump 2.4.0 --no-push --no-tag`)
@@ -65,8 +65,8 @@ maintenance branch we cherry-pick the commit from `main`.
6565
We release patch versions when a crash or a bug is fixed on the main branch and has been
6666
cherry-picked on the maintenance branch.
6767

68-
- Check the result of `git diff vX.Y-1.Z-1 ChangeLog`. (For example:
69-
`git diff v2.3.4 ChangeLog`)
68+
- Check the result of `git diff vX.Y-1.Z-1 doc/whatsnew`. (For example:
69+
`git diff v2.3.4 doc/whatsnew`)
7070
- Install the release dependencies: `pip3 install -r requirements_test.txt`
7171
- Bump the version and release by using `tbump X.Y-1.Z --no-push`. (For example:
7272
`tbump 2.3.5 --no-push`)

doc/whatsnew/2/2.14/full.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ What's New in Pylint 2.14.0?
66
Release date: TBA
77

88

9-
* The refactoring checker now also raises 'consider-using-a-generator' messages for
9+
* The refactoring checker now also raises 'consider-using-generator' messages for
1010
``max()``, ``min()`` and ``sum()``.
1111

1212
Refs #6595

doc/whatsnew/2/2.3/summary.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Other Changes
2929
=============
3030

3131
Quite a lot of bug fixes and improvements went into this release, here's a handful of them.
32-
For the full changes, check the Changelog.
32+
For the full changes, check the full changelog.
3333

3434
* We no longer emit ``*-not-iterating`` checks for builtins consumed by ``itertools``
3535

script/bump_changelog.py

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from datetime import datetime
1717
from pathlib import Path
1818

19+
# TODO: 2.14.0 Upgrade bump script
1920
DEFAULT_CHANGELOG_PATH = Path("ChangeLog")
2021

2122
RELEASE_DATE_TEXT = "Release date: TBA"

script/fix_documentation.py

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
r"(?<=\s`)([\w\-\.\(\)\=]+\s{0,1}[\w\-\.\(\)\=]*)(?=`[,\.]{0,1}\s|$)"
1515
)
1616

17+
# TODO: 2.14.0: Upgrade script for change in changelog
1718
DEFAULT_CHANGELOG = "ChangeLog"
1819
DEFAULT_SUBTITLE_PREFIX = "What's New in"
1920

0 commit comments

Comments
 (0)