summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
-rw-r--r--astroid/__pkginfo__.py2
-rw-r--r--astroid/brain/brain_functools.py1
-rw-r--r--astroid/brain/brain_typing.py1
-rw-r--r--astroid/node_classes.py4
-rw-r--r--astroid/objects.py1
-rw-r--r--astroid/protocols.py2
-rw-r--r--astroid/rebuilder.py2
-rw-r--r--astroid/scoped_nodes.py2
-rw-r--r--doc/release.md2
-rw-r--r--tbump.toml2
-rw-r--r--tests/unittest_brain.py2
-rw-r--r--tests/unittest_inference.py2
-rw-r--r--tests/unittest_lookup.py2
-rw-r--r--tests/unittest_manager.py2
-rw-r--r--tests/unittest_modutils.py2
-rw-r--r--tests/unittest_nodes.py2
-rw-r--r--tests/unittest_scoped_nodes.py1
18 files changed, 30 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 01c884a8..b7d09e9c 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 f3fec96e..3bc315ee 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 9804d535..ffab123c 100644
--- a/astroid/brain/brain_functools.py
+++ b/astroid/brain/brain_functools.py
@@ -1,6 +1,7 @@
# Copyright (c) 2016, 2018-2020 Claudiu Popa <pcmanticore@gmail.com>
# Copyright (c) 2018 hippo91 <guillaume.peillex@gmail.com>
# Copyright (c) 2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
+# Copyright (c) 2021 Alphadelta14 <alpha@alphaservcomputing.solutions>
# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
"""Astroid hooks for understanding functools library module."""
diff --git a/astroid/brain/brain_typing.py b/astroid/brain/brain_typing.py
index a28da573..775611ab 100644
--- a/astroid/brain/brain_typing.py
+++ b/astroid/brain/brain_typing.py
@@ -5,6 +5,7 @@
# Copyright (c) 2017 Łukasz Rogalski <rogalski.91@gmail.com>
# Copyright (c) 2017 David Euresti <github@euresti.com>
# Copyright (c) 2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
+# Copyright (c) 2021 Tim Martin <tim@asymptotic.co.uk>
# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
# Copyright (c) 2021 hippo91 <guillaume.peillex@gmail.com>
diff --git a/astroid/node_classes.py b/astroid/node_classes.py
index 81e6f1f1..e087b91b 100644
--- a/astroid/node_classes.py
+++ b/astroid/node_classes.py
@@ -23,8 +23,10 @@
# Copyright (c) 2019 kavins14 <kavinsingh@hotmail.com>
# Copyright (c) 2020 Raphael Gaschignard <raphael@rtpg.co>
# Copyright (c) 2020 Bryce Guinta <bryce.guinta@protonmail.com>
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
+# Copyright (c) 2021 David Liu <david@cs.toronto.edu>
+# Copyright (c) 2021 Alphadelta14 <alpha@alphaservcomputing.solutions>
+# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 Andrew Haigh <hello@nelf.in>
# Copyright (c) 2021 Federico Bond <federicobond@gmail.com>
diff --git a/astroid/objects.py b/astroid/objects.py
index a598c5bb..9e0c0194 100644
--- a/astroid/objects.py
+++ b/astroid/objects.py
@@ -4,6 +4,7 @@
# Copyright (c) 2016 Derek Gustafson <degustaf@gmail.com>
# Copyright (c) 2018 hippo91 <guillaume.peillex@gmail.com>
# Copyright (c) 2018 Bryce Guinta <bryce.paul.guinta@gmail.com>
+# Copyright (c) 2021 Alphadelta14 <alpha@alphaservcomputing.solutions>
# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
diff --git a/astroid/protocols.py b/astroid/protocols.py
index fb4cabcb..d8b1cf74 100644
--- a/astroid/protocols.py
+++ b/astroid/protocols.py
@@ -16,9 +16,9 @@
# Copyright (c) 2020-2021 hippo91 <guillaume.peillex@gmail.com>
# Copyright (c) 2020 Vilnis Termanis <vilnis.termanis@iotics.com>
# Copyright (c) 2020 Ram Rachum <ram@rachum.com>
+# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 doranid <ddandd@gmail.com>
-# 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 92988bde..1911f504 100644
--- a/astroid/rebuilder.py
+++ b/astroid/rebuilder.py
@@ -17,8 +17,8 @@
# Copyright (c) 2019-2021 Ashley Whetter <ashley@awhetter.co.uk>
# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
# Copyright (c) 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
+# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 Federico Bond <federicobond@gmail.com>
# Copyright (c) 2021 hippo91 <guillaume.peillex@gmail.com>
diff --git a/astroid/scoped_nodes.py b/astroid/scoped_nodes.py
index 910d3035..5c57920f 100644
--- a/astroid/scoped_nodes.py
+++ b/astroid/scoped_nodes.py
@@ -23,9 +23,9 @@
# Copyright (c) 2020 Peter Kolbus <peter.kolbus@gmail.com>
# Copyright (c) 2020 Tim Martin <tim@asymptotic.co.uk>
# Copyright (c) 2020 Ram Rachum <ram@rachum.com>
+# Copyright (c) 2021 doranid <ddandd@gmail.com>
# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 David Liu <david@cs.toronto.edu>
-# Copyright (c) 2021 doranid <ddandd@gmail.com>
# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
# Copyright (c) 2021 Andrew Haigh <hello@nelf.in>
# Copyright (c) 2021 pre-commit-ci[bot] <bot@noreply.github.com>
diff --git a/doc/release.md b/doc/release.md
index 3f43f6bc..a0527f72 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 f33438c6..2f94393b 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 = '''
^(?P<major>0|[1-9]\d*)
\.
diff --git a/tests/unittest_brain.py b/tests/unittest_brain.py
index b4bb85c3..6f42f19b 100644
--- a/tests/unittest_brain.py
+++ b/tests/unittest_brain.py
@@ -24,6 +24,8 @@
# Copyright (c) 2019 Grygorii Iermolenko <gyermolenko@gmail.com>
# Copyright (c) 2020 David Gilman <davidgilman1@gmail.com>
# Copyright (c) 2020 Peter Kolbus <peter.kolbus@gmail.com>
+# Copyright (c) 2021 Alphadelta14 <alpha@alphaservcomputing.solutions>
+# Copyright (c) 2021 Tim Martin <tim@asymptotic.co.uk>
# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
# Copyright (c) 2021 Andrew Haigh <hello@nelf.in>
diff --git a/tests/unittest_inference.py b/tests/unittest_inference.py
index 5c09fbda..3c00d744 100644
--- a/tests/unittest_inference.py
+++ b/tests/unittest_inference.py
@@ -17,9 +17,9 @@
# Copyright (c) 2018 Daniel Martin <daniel.martin@crowdstrike.com>
# Copyright (c) 2018 Ville Skyttä <ville.skytta@iki.fi>
# Copyright (c) 2018 Anthony Sottile <asottile@umich.edu>
+# Copyright (c) 2019, 2021 David Liu <david@cs.toronto.edu>
# Copyright (c) 2019-2021 hippo91 <guillaume.peillex@gmail.com>
# Copyright (c) 2019 Stanislav Levin <slev@altlinux.org>
-# Copyright (c) 2019 David Liu <david@cs.toronto.edu>
# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
# Copyright (c) 2020 David Gilman <davidgilman1@gmail.com>
diff --git a/tests/unittest_lookup.py b/tests/unittest_lookup.py
index d1ced9be..b49deecd 100644
--- a/tests/unittest_lookup.py
+++ b/tests/unittest_lookup.py
@@ -6,8 +6,8 @@
# Copyright (c) 2019 Ashley Whetter <ashley@awhetter.co.uk>
# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
# Copyright (c) 2020-2021 hippo91 <guillaume.peillex@gmail.com>
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 David Liu <david@cs.toronto.edu>
+# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# 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 2bed335b..5d88e4b0 100644
--- a/tests/unittest_manager.py
+++ b/tests/unittest_manager.py
@@ -13,8 +13,8 @@
# Copyright (c) 2020-2021 hippo91 <guillaume.peillex@gmail.com>
# Copyright (c) 2020 David Gilman <davidgilman1@gmail.com>
# Copyright (c) 2020 Anubhav <35621759+anubh-v@users.noreply.github.com>
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
+# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 Andrew Haigh <hello@nelf.in>
# 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 13268f4c..de5b6281 100644
--- a/tests/unittest_modutils.py
+++ b/tests/unittest_modutils.py
@@ -11,8 +11,8 @@
# Copyright (c) 2019 markmcclain <markmcclain@users.noreply.github.com>
# Copyright (c) 2020-2021 hippo91 <guillaume.peillex@gmail.com>
# Copyright (c) 2020 Peter Kolbus <peter.kolbus@gmail.com>
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
+# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 DudeNr33 <3929834+DudeNr33@users.noreply.github.com>
# Copyright (c) 2021 pre-commit-ci[bot] <bot@noreply.github.com>
diff --git a/tests/unittest_nodes.py b/tests/unittest_nodes.py
index d935c487..eaa1aa61 100644
--- a/tests/unittest_nodes.py
+++ b/tests/unittest_nodes.py
@@ -16,8 +16,8 @@
# Copyright (c) 2019 Alex Hall <alex.mojaki@gmail.com>
# Copyright (c) 2019 Hugo van Kemenade <hugovk@users.noreply.github.com>
# Copyright (c) 2020 David Gilman <davidgilman1@gmail.com>
-# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
+# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 Federico Bond <federicobond@gmail.com>
# Copyright (c) 2021 hippo91 <guillaume.peillex@gmail.com>
diff --git a/tests/unittest_scoped_nodes.py b/tests/unittest_scoped_nodes.py
index 56e1ed29..a868e564 100644
--- a/tests/unittest_scoped_nodes.py
+++ b/tests/unittest_scoped_nodes.py
@@ -20,6 +20,7 @@
# Copyright (c) 2019 Peter de Blanc <peter@standard.ai>
# Copyright (c) 2020 David Gilman <davidgilman1@gmail.com>
# Copyright (c) 2020 Tim Martin <tim@asymptotic.co.uk>
+# Copyright (c) 2021 doranid <ddandd@gmail.com>
# Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com>
# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com>
# Copyright (c) 2021 Andrew Haigh <hello@nelf.in>