Skip to content

Commit

Permalink
Release with standard version tag
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierre-Sassoulas committed Apr 26, 2021
1 parent c234b3e commit f9245c5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
2 changes: 2 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ Release date: TBA

* scm_setuptools has been added to the packaging.

* Pylint's tags are now the standard form ``vX.Y.Z`` and not ``pylint-X.Y.Z`` anymore.


What's New in Pylint 2.8.1?
===========================
Expand Down
14 changes: 7 additions & 7 deletions doc/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ git --aliases=.copyrite_aliases . --jobs=8
6. Make sure the tests are passing on Travis/GithubActions:
https://travis-ci.org/PyCQA/pylint/

7. Do the actual release by tagging the master with `pylint-X.Y.Z` (ie `pylint-1.6.12`
or `pylint-4.0.0a1` for example). Travis should deal with the release process once
the tag is pushed with `git push origin --tags`
7. Do the actual release by tagging the master with `vX.Y.Z` (ie `v1.6.12` or `v2.5.3a1`
for example). Travis should deal with the release process once the tag is pushed with
`git push origin --tags`

8. Go to github, click on "Releases" then on the `pylint-X.Y.Z` tag, choose edit tag,
and copy past the changelog in the description.
8. Go to github, click on "Releases" then on the `vX.Y.Z` tag, choose edit tag, and copy
past the changelog in the description.

## Manual Release

Expand All @@ -45,13 +45,13 @@ twine upload dist/*

### Merge tags in master for pre-commit

If the tag you just made is not part of the main branch, merge the tag `X.Y.Z` in the
If the tag you just made is not part of the main branch, merge the tag `vX.Y.Z` in the
main branch by doing a history only merge. It's done in order to signal that this is an
official release tag, and for `pre-commit autoupdate` to works.

```bash
git checkout master
git merge --no-edit --strategy=ours pylint-X.Y.Z
git merge --no-edit --strategy=ours vX.Y.Z
git push
```

Expand Down
2 changes: 2 additions & 0 deletions doc/whatsnew/2.9.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ New checkers

Other Changes
=============

* Pylint's tags are now the standard form ``vX.Y.Z`` and not ``pylint-X.Y.Z`` anymore.

0 comments on commit f9245c5

Please sign in to comment.