From 74adc8604506a451dc8a16cc00ac50464953cb3b Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Tue, 3 Aug 2021 22:29:59 +0200 Subject: [PATCH] Bump astroid to 2.6.6, update changelog --- ChangeLog | 15 ++++++++++----- astroid/__pkginfo__.py | 2 +- astroid/brain/brain_functools.py | 1 + astroid/brain/brain_typing.py | 1 + astroid/node_classes.py | 4 +++- astroid/objects.py | 1 + astroid/protocols.py | 2 +- astroid/rebuilder.py | 2 +- astroid/scoped_nodes.py | 2 +- doc/release.md | 2 +- tbump.toml | 2 +- tests/unittest_brain.py | 2 ++ tests/unittest_inference.py | 2 +- tests/unittest_lookup.py | 2 +- tests/unittest_manager.py | 2 +- tests/unittest_modutils.py | 2 +- tests/unittest_nodes.py | 2 +- tests/unittest_scoped_nodes.py | 1 + 18 files changed, 30 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01c884a8ad..b7d09e9c34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,10 +7,16 @@ What's New in astroid 2.7.0? Release date: TBA -What's New in astroid 2.6.6? +What's New in astroid 2.6.7? ============================ Release date: TBA + + +What's New in astroid 2.6.6? +============================ +Release date: 2021-08-03 + * Added support to infer return type of ``typing.cast()`` * Fix variable lookup's handling of exclusive statements @@ -23,6 +29,9 @@ Release date: TBA * Fix variable lookup's handling of except clause variables +* Fix handling of classes with duplicated bases with the same name + + Closes PyCQA/astroid#1088 What's New in astroid 2.6.5? ============================ @@ -54,10 +63,6 @@ Release date: 2021-07-19 * Added ``If.is_sys_guard`` and ``If.is_typing_guard`` helper methods -* Fix handling of classes with duplicated bases with the same name - - Closes PyCQA/astroid#1088 - * Fix a bad inferenece type for yield values inside of a derived class. Closes PyCQA/astroid#1090 diff --git a/astroid/__pkginfo__.py b/astroid/__pkginfo__.py index f3fec96ee7..3bc315eeb0 100644 --- a/astroid/__pkginfo__.py +++ b/astroid/__pkginfo__.py @@ -24,5 +24,5 @@ # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html # For details: https://github.com/PyCQA/astroid/blob/main/LICENSE -__version__ = "2.6.6-dev0" +__version__ = "2.6.6" version = __version__ diff --git a/astroid/brain/brain_functools.py b/astroid/brain/brain_functools.py index 9804d535d8..ffab123c1a 100644 --- a/astroid/brain/brain_functools.py +++ b/astroid/brain/brain_functools.py @@ -1,6 +1,7 @@ # Copyright (c) 2016, 2018-2020 Claudiu Popa # Copyright (c) 2018 hippo91 # Copyright (c) 2018 Bryce Guinta +# Copyright (c) 2021 Alphadelta14 # Copyright (c) 2021 Pierre Sassoulas """Astroid hooks for understanding functools library module.""" diff --git a/astroid/brain/brain_typing.py b/astroid/brain/brain_typing.py index a28da573b5..775611abf2 100644 --- a/astroid/brain/brain_typing.py +++ b/astroid/brain/brain_typing.py @@ -5,6 +5,7 @@ # Copyright (c) 2017 Łukasz Rogalski # Copyright (c) 2017 David Euresti # Copyright (c) 2018 Bryce Guinta +# Copyright (c) 2021 Tim Martin # Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # Copyright (c) 2021 hippo91 diff --git a/astroid/node_classes.py b/astroid/node_classes.py index 81e6f1f143..e087b91b46 100644 --- a/astroid/node_classes.py +++ b/astroid/node_classes.py @@ -23,8 +23,10 @@ # Copyright (c) 2019 kavins14 # Copyright (c) 2020 Raphael Gaschignard # Copyright (c) 2020 Bryce Guinta -# Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> +# Copyright (c) 2021 David Liu +# Copyright (c) 2021 Alphadelta14 +# Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Andrew Haigh # Copyright (c) 2021 Federico Bond diff --git a/astroid/objects.py b/astroid/objects.py index a598c5bb09..9e0c0194c9 100644 --- a/astroid/objects.py +++ b/astroid/objects.py @@ -4,6 +4,7 @@ # Copyright (c) 2016 Derek Gustafson # Copyright (c) 2018 hippo91 # Copyright (c) 2018 Bryce Guinta +# Copyright (c) 2021 Alphadelta14 # Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> diff --git a/astroid/protocols.py b/astroid/protocols.py index fb4cabcbde..d8b1cf7431 100644 --- a/astroid/protocols.py +++ b/astroid/protocols.py @@ -16,9 +16,9 @@ # Copyright (c) 2020-2021 hippo91 # Copyright (c) 2020 Vilnis Termanis # Copyright (c) 2020 Ram Rachum +# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 doranid -# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html # For details: https://github.com/PyCQA/astroid/blob/main/LICENSE diff --git a/astroid/rebuilder.py b/astroid/rebuilder.py index 92988bdeaa..1911f5040d 100644 --- a/astroid/rebuilder.py +++ b/astroid/rebuilder.py @@ -17,8 +17,8 @@ # Copyright (c) 2019-2021 Ashley Whetter # Copyright (c) 2019 Hugo van Kemenade # Copyright (c) 2019 Zbigniew Jędrzejewski-Szmek -# Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> +# Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Federico Bond # Copyright (c) 2021 hippo91 diff --git a/astroid/scoped_nodes.py b/astroid/scoped_nodes.py index 910d303564..5c57920fbf 100644 --- a/astroid/scoped_nodes.py +++ b/astroid/scoped_nodes.py @@ -23,9 +23,9 @@ # Copyright (c) 2020 Peter Kolbus # Copyright (c) 2020 Tim Martin # Copyright (c) 2020 Ram Rachum +# Copyright (c) 2021 doranid # Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 David Liu -# Copyright (c) 2021 doranid # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # Copyright (c) 2021 Andrew Haigh # Copyright (c) 2021 pre-commit-ci[bot] diff --git a/doc/release.md b/doc/release.md index 3f43f6bc94..a0527f72b5 100644 --- a/doc/release.md +++ b/doc/release.md @@ -7,7 +7,7 @@ So, you want to release the `X.Y.Z` version of astroid ? 1. Check if the dependencies of the package are correct 2. Install the release dependencies `pip3 install pre-commit tbump` 3. Bump the version and release by using `tbump X.Y.Z --no-push`. -4. Check the result. +4. Check the result (Do `git diff vX.Y.Z-1 ChangeLog` in particular). 5. Push the tag. 6. Release the version on GitHub with the same name as the tag and copy and paste the appropriate changelog in the description. This trigger the pypi release. diff --git a/tbump.toml b/tbump.toml index f33438c6fb..2f94393b77 100644 --- a/tbump.toml +++ b/tbump.toml @@ -1,7 +1,7 @@ github_url = "https://github.com/PyCQA/astroid" [version] -current = "2.6.6-dev0" +current = "2.6.6" regex = ''' ^(?P0|[1-9]\d*) \. diff --git a/tests/unittest_brain.py b/tests/unittest_brain.py index b4bb85c33b..6f42f19b3c 100644 --- a/tests/unittest_brain.py +++ b/tests/unittest_brain.py @@ -24,6 +24,8 @@ # Copyright (c) 2019 Grygorii Iermolenko # Copyright (c) 2020 David Gilman # Copyright (c) 2020 Peter Kolbus +# Copyright (c) 2021 Alphadelta14 +# Copyright (c) 2021 Tim Martin # Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # Copyright (c) 2021 Andrew Haigh diff --git a/tests/unittest_inference.py b/tests/unittest_inference.py index 5c09fbda12..3c00d7443d 100644 --- a/tests/unittest_inference.py +++ b/tests/unittest_inference.py @@ -17,9 +17,9 @@ # Copyright (c) 2018 Daniel Martin # Copyright (c) 2018 Ville Skyttä # Copyright (c) 2018 Anthony Sottile +# Copyright (c) 2019, 2021 David Liu # Copyright (c) 2019-2021 hippo91 # Copyright (c) 2019 Stanislav Levin -# Copyright (c) 2019 David Liu # Copyright (c) 2019 Ashley Whetter # Copyright (c) 2019 Hugo van Kemenade # Copyright (c) 2020 David Gilman diff --git a/tests/unittest_lookup.py b/tests/unittest_lookup.py index d1ced9bed4..b49deecd1e 100644 --- a/tests/unittest_lookup.py +++ b/tests/unittest_lookup.py @@ -6,8 +6,8 @@ # Copyright (c) 2019 Ashley Whetter # Copyright (c) 2019 Hugo van Kemenade # Copyright (c) 2020-2021 hippo91 -# Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 David Liu +# Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html diff --git a/tests/unittest_manager.py b/tests/unittest_manager.py index 2bed335b69..5d88e4b000 100644 --- a/tests/unittest_manager.py +++ b/tests/unittest_manager.py @@ -13,8 +13,8 @@ # Copyright (c) 2020-2021 hippo91 # Copyright (c) 2020 David Gilman # Copyright (c) 2020 Anubhav <35621759+anubh-v@users.noreply.github.com> -# Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> +# Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Andrew Haigh # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html diff --git a/tests/unittest_modutils.py b/tests/unittest_modutils.py index 13268f4c18..de5b62815d 100644 --- a/tests/unittest_modutils.py +++ b/tests/unittest_modutils.py @@ -11,8 +11,8 @@ # Copyright (c) 2019 markmcclain # Copyright (c) 2020-2021 hippo91 # Copyright (c) 2020 Peter Kolbus -# Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> +# Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 DudeNr33 <3929834+DudeNr33@users.noreply.github.com> # Copyright (c) 2021 pre-commit-ci[bot] diff --git a/tests/unittest_nodes.py b/tests/unittest_nodes.py index d935c4874a..eaa1aa6186 100644 --- a/tests/unittest_nodes.py +++ b/tests/unittest_nodes.py @@ -16,8 +16,8 @@ # Copyright (c) 2019 Alex Hall # Copyright (c) 2019 Hugo van Kemenade # Copyright (c) 2020 David Gilman -# Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> +# Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Federico Bond # Copyright (c) 2021 hippo91 diff --git a/tests/unittest_scoped_nodes.py b/tests/unittest_scoped_nodes.py index 56e1ed2996..a868e564d4 100644 --- a/tests/unittest_scoped_nodes.py +++ b/tests/unittest_scoped_nodes.py @@ -20,6 +20,7 @@ # Copyright (c) 2019 Peter de Blanc # Copyright (c) 2020 David Gilman # Copyright (c) 2020 Tim Martin +# Copyright (c) 2021 doranid # Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # Copyright (c) 2021 Andrew Haigh