diff --git a/ChangeLog b/ChangeLog index 1753a0dee6..5a8485ad58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,9 @@ What's New in Pylint 2.13.7? ============================ Release date: TBA +* Fix a crash caused by using the new config from 2.14.0 in 2.13.x code. + + Closes #6408 What's New in Pylint 2.13.6? diff --git a/doc/release.md b/doc/release.md index 556de5c0ae..6953e7e3dd 100644 --- a/doc/release.md +++ b/doc/release.md @@ -71,7 +71,8 @@ cherry-picked on the maintenance branch. - 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 with `git show`. -- Push the tag. +- Open a merge request to run the CI tests for this branch +- Create and 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. - Merge the `maintenance/X.Y.x` branch on the main branch. The main branch should have diff --git a/pylint/checkers/variables.py b/pylint/checkers/variables.py index 009caa9a19..65432d8ca7 100644 --- a/pylint/checkers/variables.py +++ b/pylint/checkers/variables.py @@ -2069,9 +2069,7 @@ def _is_only_type_assignment( if not isinstance(defstmt, nodes.AnnAssign) or defstmt.value: return False - if node.name in self.linter.config.additional_builtins or utils.is_builtin( - node.name - ): + if node.name in self.config.additional_builtins or utils.is_builtin(node.name): return False defstmt_frame = defstmt.frame(future=True)