summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS.txt1
-rw-r--r--ChangeLog8
-rw-r--r--astroid/__pkginfo__.py2
-rw-r--r--doc/release.md6
-rw-r--r--tbump.toml2
5 files changed, 12 insertions, 7 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index fb57482a..0fb15ad5 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -67,7 +67,6 @@ Contributors
- Peter Kolbus <peter.kolbus@gmail.com>
- Omer Katz <omer.drow@gmail.com>
- Moises Lopez <moylop260@vauxoo.com>
-- Michael <michael-k@users.noreply.github.com>
- Keichi Takahashi <keichi.t@me.com>
- Kavins Singh <kavinsingh@hotmail.com>
- Karthikeyan Singaravelan <tir.karthi@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index c69642f1..2766f58f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,10 +8,16 @@ Release date: TBA
-What's New in astroid 2.11.4?
+What's New in astroid 2.11.5?
=============================
Release date: TBA
+
+
+What's New in astroid 2.11.4?
+=============================
+Release date: 2022-05-02
+
* Fix ``col_offset`` attribute for nodes involving ``with`` on ``PyPy``.
* Fixed a crash involving two starred expressions: one inside a comprehension,
diff --git a/astroid/__pkginfo__.py b/astroid/__pkginfo__.py
index c8ee657e..28cabe34 100644
--- a/astroid/__pkginfo__.py
+++ b/astroid/__pkginfo__.py
@@ -2,5 +2,5 @@
# For details: https://github.com/PyCQA/astroid/blob/main/LICENSE
# Copyright (c) https://github.com/PyCQA/astroid/blob/main/CONTRIBUTORS.txt
-__version__ = "2.11.3"
+__version__ = "2.11.4"
version = __version__
diff --git a/doc/release.md b/doc/release.md
index 9052927b..d9bc628c 100644
--- a/doc/release.md
+++ b/doc/release.md
@@ -63,9 +63,9 @@ cherry-picked on the maintenance branch.
- Install the release dependencies: `pip3 install -r requirements_test.txt`
- Bump the version and release by using `tbump X.Y-1.Z --no-push`. (For example:
`tbump 2.3.5 --no-push`)
-- Check the result visually and then by triggering the "release tests" workflow in
- GitHub Actions first.
-- Push the tag.
+- Check the result visually with `git show`.
+- Open a merge request to run the CI tests for this branch
+- Create and push the tag.
- Release the version on GitHub with the same name as the tag and copy and paste the
appropriate changelog in the description. This triggers the PyPI release.
- Merge the `maintenance/X.Y.x` branch on the main branch. The main branch should have
diff --git a/tbump.toml b/tbump.toml
index 71b61aa4..7307cbd2 100644
--- a/tbump.toml
+++ b/tbump.toml
@@ -1,7 +1,7 @@
github_url = "https://github.com/PyCQA/astroid"
[version]
-current = "2.11.3"
+current = "2.11.4"
regex = '''
^(?P<major>0|[1-9]\d*)
\.