Skip to content

Commit da496c6

Browse files
Wip - New release process
1 parent bafb149 commit da496c6

File tree

2 files changed

+10
-26
lines changed

2 files changed

+10
-26
lines changed

ChangeLog

+2-10
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ Pylint's ChangeLog
44

55
What's New in Pylint 2.8.0?
66
===========================
7-
Release date: Undefined
7+
Release date: 2021-04-11
88

99
..
10-
Put new features here and also in 'doc/whatsnew/2.8.rst'
10+
Put new features and bugfixes here and also in 'doc/whatsnew/2.8.rst'
1111

1212
* Add new extension ``ConfusingConsecutiveElifChecker``. This optional checker emits a refactoring message (R5601 ``confusing-consecutive-elif``)
1313
if if/elif statements with different indentation levels follow directly one after the other.
@@ -39,14 +39,6 @@ Release date: Undefined
3939

4040
Closes #3406
4141

42-
43-
What's New in Pylint 2.7.5?
44-
===========================
45-
Release date: Undefined
46-
47-
..
48-
Put bug fixes that will be cherry-picked to latest major version here
49-
5042
* Reactivates old counts in report mode.
5143

5244
Closes #3819

doc/release.md

+8-16
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,11 @@ twine upload dist/*
4646

4747
## Post release
4848

49-
### New branch to create for major releases
49+
### Merge tags in master for pre-commit
5050

51-
The master branch will have all the new features for the `X.Y+1` version
52-
53-
If you're doing a major release, you need to create the `X.Y` branch where we will
54-
cherry-pick bugs to release the `X.Y.Z+1` minor versions
55-
56-
### Merge tags in master for minor releases
57-
58-
Merge the tag `X.Y.Z` in the main branch by doing a history only merge. It's done in
59-
order to signal that this is an official release tag, and for `pre-commit autoupdate` to
60-
works.
51+
If the tag you just made is not part of the main branch, merge the tag `X.Y.Z` in the
52+
main branch by doing a history only merge. It's done in order to signal that this is an
53+
official release tag, and for `pre-commit autoupdate` to works.
6154

6255
```bash
6356
git checkout master
@@ -74,8 +67,8 @@ issue labelled as blocker.
7467

7568
#### Changelog
7669

77-
- Create a new section, with the name of the release `X.Y.Z+1` on the `X.Y` branch.
78-
- If it's a major release, also create a new section for `X.Y+1.0` on the master branch
70+
- Create a new section, with the name of the release `X.Y.Z+1` or `X.Y+1.0` on the
71+
master branch.
7972

8073
You need to add the estimated date when it is going to be published. If no date can be
8174
known at that time, we should use `Undefined`.
@@ -87,6 +80,5 @@ at the examples from `doc/whatsnew`.
8780

8881
### Versions
8982

90-
Update `__version__` to `X.Y+1.0` in `pylint/__pkginfo__.py` for `master` and to
91-
`X.Y.Z+1` for the `X.Y` branch. `dev_version` should also be back to an integer after
92-
the tag.
83+
Update `__version__` to `X.Y+1.0` or `X.Y.Z+1` in `__pkginfo__`. `dev_version` should
84+
also be back to an integer after the tag.

0 commit comments

Comments
 (0)