summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Sassoulas <pierre.sassoulas@gmail.com>2021-04-25 10:17:57 +0200
committerPierre Sassoulas <pierre.sassoulas@gmail.com>2021-04-26 17:38:28 +0200
commitf9245c5ccbbe6817604113b0b53b2630ed4069ae (patch)
tree4df22a22832273a132ed0e6c9331a2e04f19567f
parentc234b3efe19db81d0d03d46c4afa6886129bd25c (diff)
downloadpylint-git-f9245c5ccbbe6817604113b0b53b2630ed4069ae.tar.gz
Release with standard version tag
-rw-r--r--ChangeLog2
-rw-r--r--doc/release.md14
-rw-r--r--doc/whatsnew/2.9.rst2
3 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 30adcca6b..52a55486a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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?
===========================
diff --git a/doc/release.md b/doc/release.md
index a9a67260c..239b6c0bf 100644
--- a/doc/release.md
+++ b/doc/release.md
@@ -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
@@ -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
```
diff --git a/doc/whatsnew/2.9.rst b/doc/whatsnew/2.9.rst
index 13dca61c1..1fdc1a837 100644
--- a/doc/whatsnew/2.9.rst
+++ b/doc/whatsnew/2.9.rst
@@ -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.