diff options
| author | Pierre Sassoulas <pierre.sassoulas@gmail.com> | 2022-01-09 11:28:53 +0100 |
|---|---|---|
| committer | Pierre Sassoulas <pierre.sassoulas@gmail.com> | 2022-01-09 11:28:53 +0100 |
| commit | c526fafb5887d55334afc96fea0f6fbf8b939130 (patch) | |
| tree | 917212fb22462a7b5f71b3e6993506701a9d3316 | |
| parent | 5c565b728510b4e8360de3c5b1434c51ccb96b1f (diff) | |
| parent | 4fd3d347763c2358dc4d417d8b277db5a869ffd8 (diff) | |
| download | astroid-git-c526fafb5887d55334afc96fea0f6fbf8b939130.tar.gz | |
Merge branch '2.9' into main
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | doc/release.md | 14 | ||||
| -rw-r--r-- | tests/unittest_modutils.py | 3 |
3 files changed, 23 insertions, 2 deletions
@@ -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/doc/release.md b/doc/release.md index a595207d..96855ef3 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/tests/unittest_modutils.py b/tests/unittest_modutils.py index 01d5e5b9..e9e5743d 100644 --- a/tests/unittest_modutils.py +++ b/tests/unittest_modutils.py @@ -11,11 +11,12 @@ # 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-2022 Daniël van Noord <13665637+DanielNoord@users.noreply.github.com> # Copyright (c) 2021 Pierre Sassoulas <pierre.sassoulas@gmail.com> -# 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] <bot@noreply.github.com> +# Copyright (c) 2022 Alexander Shadchin <alexandr.shadchin@gmail.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 |