From d3449531aa5bcefb47cbb55ac695be5ed3dd635b Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Sun, 9 Jan 2022 11:22:43 +0100 Subject: [PATCH] Bump astroid to 2.9.3, update changelog --- ChangeLog | 8 +++++++- astroid/__pkginfo__.py | 2 +- doc/release.md | 14 ++++++++++++++ tbump.toml | 2 +- tests/unittest_modutils.py | 3 ++- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 783391c360..3bb23e2de8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,10 +7,16 @@ What's New in astroid 2.10.0? Release date: TBA -What's New in astroid 2.9.3? +What's New in astroid 2.9.4? ============================ Release date: TBA + + +What's New in astroid 2.9.3? +============================ +Release date: 2022-01-09 + * Fixed regression where packages without a ``__init__.py`` file were not recognized or imported correctly. diff --git a/astroid/__pkginfo__.py b/astroid/__pkginfo__.py index fb179675c8..849e09d5d7 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.9.2" +__version__ = "2.9.3" version = __version__ diff --git a/doc/release.md b/doc/release.md index a595207d26..96855ef3ee 100644 --- a/doc/release.md +++ b/doc/release.md @@ -29,3 +29,17 @@ Check the result and then upgrade the main branch We move issue that were not done in the next milestone and block release only if it's an issue labelled as blocker. + +## Post release + +### Merge tags in main for pre-commit + +If the tag you just made is not part of the main branch, merge the tag `vX.Y.Z` in the +main branch by doing a history only merge. It's done in order to signal that this is an +official release tag, and for `pre-commit autoupdate` to works. + +```bash +git checkout main +git merge --no-edit --strategy=ours vX.Y.Z +git push +``` diff --git a/tbump.toml b/tbump.toml index a3305c24e5..60d7ccb3c0 100644 --- a/tbump.toml +++ b/tbump.toml @@ -1,7 +1,7 @@ github_url = "https://github.com/PyCQA/astroid" [version] -current = "2.9.2" +current = "2.9.3" regex = ''' ^(?P0|[1-9]\d*) \. diff --git a/tests/unittest_modutils.py b/tests/unittest_modutils.py index 01d5e5b91e..e9e5743df2 100644 --- a/tests/unittest_modutils.py +++ b/tests/unittest_modutils.py @@ -11,11 +11,12 @@ # Copyright (c) 2019 markmcclain # Copyright (c) 2020-2021 hippo91 # Copyright (c) 2020 Peter Kolbus +# Copyright (c) 2021-2022 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com> # Copyright (c) 2021 Pierre Sassoulas -# Copyright (c) 2021 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com> # Copyright (c) 2021 Marc Mueller <30130371+cdce8p@users.noreply.github.com> # Copyright (c) 2021 DudeNr33 <3929834+DudeNr33@users.noreply.github.com> # Copyright (c) 2021 pre-commit-ci[bot] +# Copyright (c) 2022 Alexander Shadchin # 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