Merge branch '2.9' into main

Author: Pierre-Sassoulas

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.
 

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
+```

tests/unittest_modutils.py

@@ -11,11 +11,12 @@
 # Copyright (c) 2019 markmcclain <[email protected]>
 # Copyright (c) 2020-2021 hippo91 <[email protected]>
 # Copyright (c) 2020 Peter Kolbus <[email protected]>
+# Copyright (c) 2021-2022 Daniël van Noord <[email protected]>
 # Copyright (c) 2021 Pierre Sassoulas <[email protected]>
-# Copyright (c) 2021 Daniël van Noord <[email protected]>
 # Copyright (c) 2021 Marc Mueller <[email protected]>
 # Copyright (c) 2021 DudeNr33 <[email protected]>
 # Copyright (c) 2021 pre-commit-ci[bot] <[email protected]>
+# Copyright (c) 2022 Alexander Shadchin <[email protected]>
 
 # 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