diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 9a86723b36..a36661ab9a 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -121,6 +121,7 @@ contributors: - David Gilman - Andrew Haigh (nelfin) - へーさん +- orSolocate <38433858+orSolocate@users.noreply.github.com> - Thomas Hisch - Marianna Polatoglou : minor contribution for wildcard import check - Manuel Vázquez Acosta @@ -138,7 +139,6 @@ contributors: * Added new extension which detects comparing integers to zero, * Added new useless-return checker, * Added new try-except-raise checker -- orSolocate <38433858+orSolocate@users.noreply.github.com> - Téo Bouvard - Tushar Sadhwani (tusharsadhwani) - Mihai Balint diff --git a/ChangeLog b/ChangeLog index be25eceb2b..1e701b22db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,15 +10,22 @@ Release date: TBA Put new features here and also in 'doc/whatsnew/2.14.rst' + .. Insert your changelog randomly, it will reduce merge conflicts (Ie. not necessarily at the end) -What's New in Pylint 2.13.1? +What's New in Pylint 2.13.2? ============================ Release date: TBA + + +What's New in Pylint 2.13.1? +============================ +Release date: 2022-03-26 + * Fix a regression in 2.13.0 where ``used-before-assignment`` was emitted for the usage of a nonlocal in a try block. diff --git a/doc/release.md b/doc/release.md index 07b4a647bb..c68ef00bf1 100644 --- a/doc/release.md +++ b/doc/release.md @@ -45,6 +45,8 @@ branch appropriate changelog in the description. This triggers the PyPI release. - Delete the `maintenance/X.Y-1.x` branch. (For example: `maintenance/2.3.x`) - Create a `maintenance/X.Y.x` (For example: `maintenance/2.4.x` from the `v2.4.0` tag.) +- Close the current milestone and create the new ones (For example: close `2.4.0`, + create `2.4.1` and `2.6.0`) ## Backporting a fix from `main` to the maintenance branch @@ -67,8 +69,7 @@ cherry-picked on the maintenance branch. - Install the release dependencies: `pip3 install -r requirements_test.txt` - Bump the version and release by using `tbump X.Y-1.Z --no-push`. (For example: `tbump 2.3.5 --no-push`) -- Check the result visually and then by triggering the "release tests" workflow in - GitHub Actions first. +- Check the result visually with `git show`. - Push the tag. - Release the version on GitHub with the same name as the tag and copy and paste the appropriate changelog in the description. This triggers the PyPI release. @@ -77,6 +78,8 @@ cherry-picked on the maintenance branch. `pre-commit autoupdate` works for pylint. - Fix version conflicts properly, or bump the version to `X.Y.0-devZ` (For example: `2.4.0-dev6`) before pushing on the main branch +- Close the current milestone and create the new one (For example: close `2.3.5`, create + `2.3.6`) ## Milestone handling diff --git a/pylint/__pkginfo__.py b/pylint/__pkginfo__.py index 1b459ff013..588fb54a02 100644 --- a/pylint/__pkginfo__.py +++ b/pylint/__pkginfo__.py @@ -4,7 +4,7 @@ from typing import Tuple -__version__ = "2.13.0" +__version__ = "2.13.1" def get_numversion_from_version(v: str) -> Tuple: diff --git a/tbump.toml b/tbump.toml index 83785652fc..fa371dd6e3 100644 --- a/tbump.toml +++ b/tbump.toml @@ -1,7 +1,7 @@ github_url = "https://github.com/PyCQA/pylint" [version] -current = "2.13.0" +current = "2.13.1" regex = ''' ^(?P0|[1-9]\d*) \.