From 36b81ead6dcecde342c696eab3089267acbe4ff3 Mon Sep 17 00:00:00 2001
From: Pierre Sassoulas <pierre.sassoulas@gmail.com>
Date: Tue, 19 Apr 2022 21:08:40 +0200
Subject: [PATCH] Bump astroid to 2.11.3, update changelog

---
 CONTRIBUTORS.txt                  | 6 ++----
 ChangeLog                         | 8 +++++++-
 astroid/__pkginfo__.py            | 2 +-
 requirements_test.txt             | 1 +
 script/.contributors_aliases.json | 8 ++++++++
 tbump.toml                        | 7 +------
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 49a7749854..fb57482ae2 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -38,13 +38,14 @@ Contributors
 - Julien Jehannet <julien.jehannet@logilab.fr>
 - Calen Pennington <calen.pennington@gmail.com>
 - Phil Schaf <flying-sheep@web.de>
+- Hugo van Kemenade <hugovk@users.noreply.github.com>
 - Alex Hall <alex.mojaki@gmail.com>
 - Tushar Sadhwani <86737547+tushar-deepsource@users.noreply.github.com>
 - Tim Martin <tim@asymptotic.co.uk>
 - Raphael Gaschignard <raphael@makeleaps.com>
 - Radosław Ganczarek <radoslaw@ganczarek.in>
+- Paligot Gérard <androwiiid@gmail.com>
 - Ioana Tagirta <ioana.tagirta@gmail.com>
-- Hugo <hugovk@users.noreply.github.com>
 - Derek Gustafson <degustaf@gmail.com>
 - David Shea <dshea@redhat.com>
 - Daniel Harding <dharding@gmail.com>
@@ -55,7 +56,6 @@ Contributors
 - Marien Zwart <marienz@gentoo.org>
 - FELD Boris <lothiraldan@gmail.com>
 - Enji Cooper <yaneurabeya@gmail.com>
-- AndroWiiid <androwiiid@gmail.com>
 - doranid <ddandd@gmail.com>
 - brendanator <brendan.maginnis@gmail.com>
 - Tomas Gavenciak <gavento@ucw.cz>
@@ -105,7 +105,6 @@ Contributors
 - Philipp Hörist <philipp@hoerist.com>
 - Peter de Blanc <peter@standard.ai>
 - Peter Talley <peterctalley@gmail.com>
-- Paligot Gérard <androwiiid@gmail.com>
 - Ovidiu Sabou <ovidiu@sabou.org>
 - Nicolas Noirbent <nicolas@noirbent.fr>
 - Neil Girdhar <mistersheik@gmail.com>
@@ -127,7 +126,6 @@ Contributors
 - Jakub Wilk <jwilk@jwilk.net>
 - Iva Miholic <ivamiho@gmail.com>
 - Ionel Maries Cristian <contact@ionelmc.ro>
-- Hugo van Kemenade <hugovk@users.noreply.github.com>
 - HoverHell <hoverhell@gmail.com>
 - HQupgradeHQ <18361586+HQupgradeHQ@users.noreply.github.com>
 - Grygorii Iermolenko <gyermolenko@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index e91bcfcccf..736f8975c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,10 +8,16 @@ Release date: TBA
 
 
 
-What's New in astroid 2.11.3?
+What's New in astroid 2.11.4?
 =============================
 Release date: TBA
 
+
+
+What's New in astroid 2.11.3?
+=============================
+Release date: 2022-04-19
+
 * Fixed an error in the Qt brain when building ``instance_attrs``.
 
   Closes PyCQA/pylint#6221
diff --git a/astroid/__pkginfo__.py b/astroid/__pkginfo__.py
index 1aa5cb2667..c8ee657eb6 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.2"
+__version__ = "2.11.3"
 version = __version__
diff --git a/requirements_test.txt b/requirements_test.txt
index 135675383d..3b078c4606 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -4,6 +4,7 @@ coveralls~=3.3
 coverage~=5.5
 pre-commit~=2.17
 pytest-cov~=3.0
+contributors-txt>=0.7.3
 tbump~=6.3.2
 types-typed-ast; implementation_name=="cpython" and python_version<"3.8"
 types-pkg_resources==0.1.3
diff --git a/script/.contributors_aliases.json b/script/.contributors_aliases.json
index 964d472f3b..60fabfa86e 100644
--- a/script/.contributors_aliases.json
+++ b/script/.contributors_aliases.json
@@ -13,6 +13,10 @@
     "name": "Marc Mueller",
     "team": "Maintainers"
   },
+  "androwiiid@gmail.com": {
+    "mails": ["androwiiid@gmail.com"],
+    "name": "Paligot Gérard"
+  },
   "areveny@protonmail.com": {
     "mails": ["areveny@protonmail.com", "self@areveny.com"],
     "name": "Areveny",
@@ -82,6 +86,10 @@
     "name": "Hippo91",
     "team": "Maintainers"
   },
+  "hugovk@users.noreply.github.com": {
+    "mails": ["hugovk@users.noreply.github.com"],
+    "name": "Hugo van Kemenade"
+  },
   "jacob@bogdanov.dev": {
     "mails": ["jacob@bogdanov.dev", "jbogdanov@128technology.com"],
     "name": "Jacob Bogdanov"
diff --git a/tbump.toml b/tbump.toml
index eedafcddd7..71b61aa4ad 100644
--- a/tbump.toml
+++ b/tbump.toml
@@ -1,7 +1,7 @@
 github_url = "https://github.com/PyCQA/astroid"
 
 [version]
-current = "2.11.2"
+current = "2.11.3"
 regex = '''
 ^(?P<major>0|[1-9]\d*)
 \.
@@ -28,11 +28,6 @@ src = "astroid/__pkginfo__.py"
 name = "Upgrade changelog changelog"
 cmd = "python3 script/bump_changelog.py {new_version}"
 
-[[before_commit]]
-# We only need this during tbump, it's not compatible with python < 3.7
-name = "Install dependencie for contributors.txt's update."
-cmd = "pip install 'contributors-txt>=0.7.3'"
-
 [[before_commit]]
 name = "Normalize the contributors-txt configuration"
 cmd = "contributors-txt-normalize-configuration -a script/.contributors_aliases.json -o script/.contributors_aliases.json"