From 79fdc323f058f5f2ba754c29b564818d898548ae Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Sat, 29 May 2021 22:24:58 +0200 Subject: [PATCH] Update copyright notice for 2.5.7 --- .copyrite_aliases | 7 +++++++ ChangeLog | 2 +- astroid/as_string.py | 1 + astroid/bases.py | 1 + astroid/brain/brain_namedtuple_enum.py | 4 +++- astroid/brain/brain_numpy_core_function_base.py | 2 +- astroid/brain/brain_numpy_core_multiarray.py | 2 +- astroid/brain/brain_numpy_core_numeric.py | 2 +- astroid/brain/brain_six.py | 1 + astroid/brain/brain_typing.py | 5 ++++- astroid/builder.py | 1 + astroid/context.py | 1 + astroid/exceptions.py | 1 + astroid/inference.py | 1 + astroid/interpreter/_import/spec.py | 3 ++- astroid/manager.py | 2 ++ astroid/mixins.py | 1 + astroid/modutils.py | 2 +- astroid/node_classes.py | 3 ++- astroid/nodes.py | 1 + astroid/rebuilder.py | 2 ++ astroid/scoped_nodes.py | 2 ++ doc/release.md | 8 +++----- tests/unittest_brain.py | 4 +++- tests/unittest_brain_numpy_core_umath.py | 1 + tests/unittest_builder.py | 2 ++ tests/unittest_inference.py | 3 ++- tests/unittest_modutils.py | 2 ++ tests/unittest_nodes.py | 3 ++- tests/unittest_object_model.py | 1 + tests/unittest_regrtest.py | 1 + tests/unittest_scoped_nodes.py | 3 ++- 32 files changed, 57 insertions(+), 18 deletions(-) diff --git a/.copyrite_aliases b/.copyrite_aliases index 772dc425aa..91c46154e6 100644 --- a/.copyrite_aliases +++ b/.copyrite_aliases @@ -71,5 +71,12 @@ ], "authoritative_mail": "ville.skytta@iki.fi", "name": "Ville Skyttä" + }, + { + "mails": [ + "66853113+pre-commit-ci[bot]@users.noreply.github.com" + ], + "authoritative_mail": "bot@noreply.github.com", + "name": "pre-commit-ci[bot]" } ] diff --git a/ChangeLog b/ChangeLog index cf92b3e3e9..b216adeeb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,7 +8,7 @@ Release Date: TBA What's New in astroid 2.5.7? ============================ -Release Date: TBA +Release Date: 2021-05-09 * Fix six.with_metaclass transformation so it doesn't break user defined transformations. diff --git a/astroid/as_string.py b/astroid/as_string.py index 884eb527b7..d35f6c17b8 100644 --- a/astroid/as_string.py +++ b/astroid/as_string.py @@ -13,6 +13,7 @@ # Copyright (c) 2018 Nick Drozd # Copyright (c) 2019 Alex Hall # Copyright (c) 2019 Hugo van Kemenade +# Copyright (c) 2021 pre-commit-ci[bot] # Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> diff --git a/astroid/bases.py b/astroid/bases.py index 97b10366bf..99e6a2eac6 100644 --- a/astroid/bases.py +++ b/astroid/bases.py @@ -13,6 +13,7 @@ # Copyright (c) 2018 Nick Drozd # Copyright (c) 2018 Daniel Colascione # Copyright (c) 2019 Hugo van Kemenade +# Copyright (c) 2021 Andrew Haigh # Copyright (c) 2021 Pierre Sassoulas # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html diff --git a/astroid/brain/brain_namedtuple_enum.py b/astroid/brain/brain_namedtuple_enum.py index a9f1594926..9bef844f91 100644 --- a/astroid/brain/brain_namedtuple_enum.py +++ b/astroid/brain/brain_namedtuple_enum.py @@ -14,8 +14,10 @@ # Copyright (c) 2019 Ashley Whetter # Copyright (c) 2020 hippo91 # Copyright (c) 2020 Ram Rachum -# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> +# Copyright (c) 2021 Andrew Haigh +# Copyright (c) 2021 pre-commit-ci[bot] # 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 # For details: https://github.com/PyCQA/astroid/blob/master/LICENSE diff --git a/astroid/brain/brain_numpy_core_function_base.py b/astroid/brain/brain_numpy_core_function_base.py index 3a74c97ff7..3ddd8cc75f 100644 --- a/astroid/brain/brain_numpy_core_function_base.py +++ b/astroid/brain/brain_numpy_core_function_base.py @@ -1,7 +1,7 @@ # Copyright (c) 2019-2021 hippo91 # Copyright (c) 2020 Claudiu Popa -# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # 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 # For details: https://github.com/PyCQA/astroid/blob/master/LICENSE diff --git a/astroid/brain/brain_numpy_core_multiarray.py b/astroid/brain/brain_numpy_core_multiarray.py index 75def7482c..20b9ca860b 100644 --- a/astroid/brain/brain_numpy_core_multiarray.py +++ b/astroid/brain/brain_numpy_core_multiarray.py @@ -1,7 +1,7 @@ # Copyright (c) 2019-2020 hippo91 # Copyright (c) 2020 Claudiu Popa -# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # 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 # For details: https://github.com/PyCQA/astroid/blob/master/LICENSE diff --git a/astroid/brain/brain_numpy_core_numeric.py b/astroid/brain/brain_numpy_core_numeric.py index 726745836c..df5c866467 100644 --- a/astroid/brain/brain_numpy_core_numeric.py +++ b/astroid/brain/brain_numpy_core_numeric.py @@ -1,7 +1,7 @@ # Copyright (c) 2019-2021 hippo91 # Copyright (c) 2020 Claudiu Popa -# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # 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 # For details: https://github.com/PyCQA/astroid/blob/master/LICENSE diff --git a/astroid/brain/brain_six.py b/astroid/brain/brain_six.py index 91d3da1602..d6a4b149ab 100644 --- a/astroid/brain/brain_six.py +++ b/astroid/brain/brain_six.py @@ -3,6 +3,7 @@ # Copyright (c) 2018 Bryce Guinta # Copyright (c) 2020-2021 hippo91 # Copyright (c) 2020 Ram Rachum +# Copyright (c) 2021 Artsiom Kaval # Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Francis Charette Migneault diff --git a/astroid/brain/brain_typing.py b/astroid/brain/brain_typing.py index 1fffb7f014..a24db455d3 100644 --- a/astroid/brain/brain_typing.py +++ b/astroid/brain/brain_typing.py @@ -1,9 +1,12 @@ +# Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html +# For details: https://github.com/PyCQA/astroid/blob/master/LICENSE + # Copyright (c) 2017-2018 Claudiu Popa # Copyright (c) 2017 Łukasz Rogalski # Copyright (c) 2017 David Euresti # Copyright (c) 2018 Bryce Guinta -# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # Copyright (c) 2021 Pierre Sassoulas +# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # Copyright (c) 2021 hippo91 """Astroid hooks for typing.py support.""" diff --git a/astroid/builder.py b/astroid/builder.py index 4a066ee836..4b6d7ceb2e 100644 --- a/astroid/builder.py +++ b/astroid/builder.py @@ -8,6 +8,7 @@ # Copyright (c) 2017 Łukasz Rogalski # Copyright (c) 2018 Anthony Sottile # Copyright (c) 2020-2021 hippo91 +# Copyright (c) 2021 Andrew Haigh # Copyright (c) 2021 Pierre Sassoulas # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html diff --git a/astroid/context.py b/astroid/context.py index d7bf81bf17..440d1cebae 100644 --- a/astroid/context.py +++ b/astroid/context.py @@ -4,6 +4,7 @@ # Copyright (c) 2018 Nick Drozd # Copyright (c) 2019-2021 hippo91 # Copyright (c) 2020 Bryce Guinta +# Copyright (c) 2021 Andrew Haigh # Copyright (c) 2021 Pierre Sassoulas # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html diff --git a/astroid/exceptions.py b/astroid/exceptions.py index a20bf47aa6..438f8aad5c 100644 --- a/astroid/exceptions.py +++ b/astroid/exceptions.py @@ -5,6 +5,7 @@ # Copyright (c) 2016 Derek Gustafson # Copyright (c) 2018 Bryce Guinta # Copyright (c) 2020-2021 hippo91 +# Copyright (c) 2021 Andrew Haigh # Copyright (c) 2021 Pierre Sassoulas # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html diff --git a/astroid/inference.py b/astroid/inference.py index dd9a565aec..352d8b6bb8 100644 --- a/astroid/inference.py +++ b/astroid/inference.py @@ -16,6 +16,7 @@ # Copyright (c) 2018 Ashley Whetter # Copyright (c) 2018 HoverHell # Copyright (c) 2020 Leandro T. C. Melo +# Copyright (c) 2021 Andrew Haigh # Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> diff --git a/astroid/interpreter/_import/spec.py b/astroid/interpreter/_import/spec.py index 0a3db54964..472df37211 100644 --- a/astroid/interpreter/_import/spec.py +++ b/astroid/interpreter/_import/spec.py @@ -10,8 +10,9 @@ # Copyright (c) 2020-2021 hippo91 # Copyright (c) 2020 Peter Kolbus # Copyright (c) 2020 Raphael Gaschignard -# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> +# Copyright (c) 2021 DudeNr33 <3929834+DudeNr33@users.noreply.github.com> # Copyright (c) 2021 Pierre Sassoulas +# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> import abc import collections diff --git a/astroid/manager.py b/astroid/manager.py index 6525d1badd..bed88875d4 100644 --- a/astroid/manager.py +++ b/astroid/manager.py @@ -13,6 +13,8 @@ # Copyright (c) 2020 Raphael Gaschignard # Copyright (c) 2020 Anubhav <35621759+anubh-v@users.noreply.github.com> # Copyright (c) 2020 Ashley Whetter +# Copyright (c) 2021 DudeNr33 <3929834+DudeNr33@users.noreply.github.com> +# Copyright (c) 2021 pre-commit-ci[bot] # Copyright (c) 2021 Pierre Sassoulas # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html diff --git a/astroid/mixins.py b/astroid/mixins.py index c7a538d002..6c4d112c14 100644 --- a/astroid/mixins.py +++ b/astroid/mixins.py @@ -6,6 +6,7 @@ # Copyright (c) 2015 Florian Bruhin # Copyright (c) 2016 Jakub Wilk # Copyright (c) 2018 Nick Drozd +# Copyright (c) 2021 pre-commit-ci[bot] # Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> diff --git a/astroid/modutils.py b/astroid/modutils.py index a71f2745e7..fc3f6bf06b 100644 --- a/astroid/modutils.py +++ b/astroid/modutils.py @@ -17,8 +17,8 @@ # Copyright (c) 2019 BasPH # Copyright (c) 2020 hippo91 # Copyright (c) 2020 Peter Kolbus +# Copyright (c) 2021 DudeNr33 <3929834+DudeNr33@users.noreply.github.com> # Copyright (c) 2021 Pierre Sassoulas -# Copyright (c) 2021 Andreas Finkler # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html # For details: https://github.com/PyCQA/astroid/blob/master/LICENSE diff --git a/astroid/node_classes.py b/astroid/node_classes.py index 5b92345d76..32fb76662e 100644 --- a/astroid/node_classes.py +++ b/astroid/node_classes.py @@ -23,8 +23,9 @@ # 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 Federico Bond +# Copyright (c) 2021 Pierre Sassoulas # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html # For details: https://github.com/PyCQA/astroid/blob/master/LICENSE diff --git a/astroid/nodes.py b/astroid/nodes.py index dfad2ce03d..2119d19dfc 100644 --- a/astroid/nodes.py +++ b/astroid/nodes.py @@ -7,6 +7,7 @@ # Copyright (c) 2017 Ashley Whetter # Copyright (c) 2017 rr- # Copyright (c) 2018 Bryce Guinta +# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # Copyright (c) 2021 Pierre Sassoulas # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html diff --git a/astroid/rebuilder.py b/astroid/rebuilder.py index 611958955f..d107f19254 100644 --- a/astroid/rebuilder.py +++ b/astroid/rebuilder.py @@ -17,6 +17,8 @@ # Copyright (c) 2019-2021 Ashley Whetter # Copyright (c) 2019 Hugo van Kemenade # Copyright (c) 2019 Zbigniew Jędrzejewski-Szmek +# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> +# Copyright (c) 2021 Federico Bond # Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 hippo91 diff --git a/astroid/scoped_nodes.py b/astroid/scoped_nodes.py index 75f74584de..c48d7cc5f7 100644 --- a/astroid/scoped_nodes.py +++ b/astroid/scoped_nodes.py @@ -24,6 +24,8 @@ # Copyright (c) 2020 Tim Martin # Copyright (c) 2020 Ram Rachum # Copyright (c) 2021 Pierre Sassoulas +# Copyright (c) 2021 Andrew Haigh +# Copyright (c) 2021 pre-commit-ci[bot] # 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/doc/release.md b/doc/release.md index d0935d3472..424b39ef76 100644 --- a/doc/release.md +++ b/doc/release.md @@ -17,12 +17,10 @@ git --aliases=.copyrite_aliases . --jobs=8 # automatically ``` -4. Submit your changes in a merge request. +4. Submit your changes in a merge request and make sure the tests are passing on + Travis/GithubActions: https://travis-ci.org/PyCQA/astroid/ -5. Make sure the tests are passing on Travis/GithubActions: - https://travis-ci.org/PyCQA/astroid/ - -6. Do the actual release by tagging the master with `vX.Y.Z` (ie `v1.6.12` or `v3.0.0a0` +5. Do the actual release by tagging the master with `vX.Y.Z` (ie `v1.6.12` or `v3.0.0a0` for example). Until the release is done via Travis or GitHub actions on tag, run the following diff --git a/tests/unittest_brain.py b/tests/unittest_brain.py index d12be6d8d8..427df6fba7 100644 --- a/tests/unittest_brain.py +++ b/tests/unittest_brain.py @@ -24,8 +24,10 @@ # Copyright (c) 2019 Grygorii Iermolenko # Copyright (c) 2020 David Gilman # Copyright (c) 2020 Peter Kolbus -# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # Copyright (c) 2021 Pierre Sassoulas +# Copyright (c) 2021 Andrew Haigh +# Copyright (c) 2021 Artsiom Kaval +# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # Copyright (c) 2021 Damien Baty # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html diff --git a/tests/unittest_brain_numpy_core_umath.py b/tests/unittest_brain_numpy_core_umath.py index 5559bdd581..fad4c2e423 100644 --- a/tests/unittest_brain_numpy_core_umath.py +++ b/tests/unittest_brain_numpy_core_umath.py @@ -1,6 +1,7 @@ # Copyright (c) 2019-2021 hippo91 # Copyright (c) 2019 Ashley Whetter # Copyright (c) 2020 Claudiu Popa +# Copyright (c) 2021 Andrew Haigh # Copyright (c) 2021 Pierre Sassoulas # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html diff --git a/tests/unittest_builder.py b/tests/unittest_builder.py index 5159978d9a..70e31770f5 100644 --- a/tests/unittest_builder.py +++ b/tests/unittest_builder.py @@ -12,6 +12,8 @@ # Copyright (c) 2019 Ashley Whetter # Copyright (c) 2019 Hugo van Kemenade # Copyright (c) 2020-2021 hippo91 +# Copyright (c) 2021 pre-commit-ci[bot] +# Copyright (c) 2021 Andrew Haigh # Copyright (c) 2021 Pierre Sassoulas # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html diff --git a/tests/unittest_inference.py b/tests/unittest_inference.py index 2e88891637..927b345794 100644 --- a/tests/unittest_inference.py +++ b/tests/unittest_inference.py @@ -26,8 +26,9 @@ # Copyright (c) 2020 Peter Kolbus # Copyright (c) 2020 Karthikeyan Singaravelan # Copyright (c) 2020 Bryce Guinta -# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> +# Copyright (c) 2021 Andrew Haigh # Copyright (c) 2021 Pierre Sassoulas +# Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # Copyright (c) 2021 Francis Charette Migneault # 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 248a88cdb9..e13d194558 100644 --- a/tests/unittest_modutils.py +++ b/tests/unittest_modutils.py @@ -11,6 +11,8 @@ # Copyright (c) 2019 markmcclain # Copyright (c) 2020-2021 hippo91 # Copyright (c) 2020 Peter Kolbus +# Copyright (c) 2021 DudeNr33 <3929834+DudeNr33@users.noreply.github.com> +# Copyright (c) 2021 pre-commit-ci[bot] # Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> diff --git a/tests/unittest_nodes.py b/tests/unittest_nodes.py index 9b3971cef7..4d4211e7ec 100644 --- a/tests/unittest_nodes.py +++ b/tests/unittest_nodes.py @@ -16,8 +16,9 @@ # 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 Federico Bond +# Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 hippo91 # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html diff --git a/tests/unittest_object_model.py b/tests/unittest_object_model.py index 64e49609b9..15619c10e4 100644 --- a/tests/unittest_object_model.py +++ b/tests/unittest_object_model.py @@ -4,6 +4,7 @@ # Copyright (c) 2018 Bryce Guinta # Copyright (c) 2019 Ashley Whetter # Copyright (c) 2020 David Gilman +# Copyright (c) 2021 Andrew Haigh # Copyright (c) 2021 Pierre Sassoulas # Copyright (c) 2021 hippo91 # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html diff --git a/tests/unittest_regrtest.py b/tests/unittest_regrtest.py index acabde135e..89b02c9123 100644 --- a/tests/unittest_regrtest.py +++ b/tests/unittest_regrtest.py @@ -10,6 +10,7 @@ # Copyright (c) 2019, 2021 hippo91 # Copyright (c) 2019 Ashley Whetter # Copyright (c) 2020 David Gilman +# Copyright (c) 2021 Andrew Haigh # Copyright (c) 2021 Pierre Sassoulas # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html diff --git a/tests/unittest_scoped_nodes.py b/tests/unittest_scoped_nodes.py index a298803c91..6537f63518 100644 --- a/tests/unittest_scoped_nodes.py +++ b/tests/unittest_scoped_nodes.py @@ -20,8 +20,9 @@ # Copyright (c) 2019 Peter de Blanc # Copyright (c) 2020 David Gilman # Copyright (c) 2020 Tim Martin -# Copyright (c) 2021 Pierre Sassoulas +# Copyright (c) 2021 Andrew Haigh # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> +# Copyright (c) 2021 Pierre Sassoulas # Licensed under the LGPL: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html # For details: https://github.com/PyCQA/astroid/blob/master/LICENSE