Skip to content

Commit 4877164

Browse files
Merge branch 'maintenance/2.11.x' into main
2 parents cd8df0d + 36b81ea commit 4877164

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

CONTRIBUTORS.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,14 @@ Contributors
3838
- Julien Jehannet <[email protected]>
3939
- Calen Pennington <[email protected]>
4040
- Phil Schaf <[email protected]>
41+
- Hugo van Kemenade <[email protected]>
4142
- Alex Hall <[email protected]>
4243
- Tushar Sadhwani <[email protected]>
4344
- Tim Martin <[email protected]>
4445
- Raphael Gaschignard <[email protected]>
4546
- Radosław Ganczarek <[email protected]>
47+
- Paligot Gérard <[email protected]>
4648
- Ioana Tagirta <[email protected]>
47-
4849
- Derek Gustafson <[email protected]>
4950
- David Shea <[email protected]>
5051
- Daniel Harding <[email protected]>
@@ -55,7 +56,6 @@ Contributors
5556
- Marien Zwart <[email protected]>
5657
- FELD Boris <[email protected]>
5758
- Enji Cooper <[email protected]>
58-
- AndroWiiid <[email protected]>
5959
- doranid <[email protected]>
6060
- brendanator <[email protected]>
6161
- Tomas Gavenciak <[email protected]>
@@ -105,7 +105,6 @@ Contributors
105105
- Philipp Hörist <[email protected]>
106106
- Peter de Blanc <[email protected]>
107107
- Peter Talley <[email protected]>
108-
- Paligot Gérard <[email protected]>
109108
- Ovidiu Sabou <[email protected]>
110109
- Nicolas Noirbent <[email protected]>
111110
- Neil Girdhar <[email protected]>
@@ -127,7 +126,6 @@ Contributors
127126
- Jakub Wilk <[email protected]>
128127
- Iva Miholic <[email protected]>
129128
- Ionel Maries Cristian <[email protected]>
130-
- Hugo van Kemenade <[email protected]>
131129
- HoverHell <[email protected]>
132130
- HQupgradeHQ <[email protected]>
133131
- Grygorii Iermolenko <[email protected]>

ChangeLog

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,16 @@ Release date: TBA
88

99

1010

11-
What's New in astroid 2.11.3?
11+
What's New in astroid 2.11.4?
1212
=============================
1313
Release date: TBA
1414

15+
16+
17+
What's New in astroid 2.11.3?
18+
=============================
19+
Release date: 2022-04-19
20+
1521
* Fixed an error in the Qt brain when building ``instance_attrs``.
1622

1723
Closes PyCQA/pylint#6221

requirements_test.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ coveralls~=3.3
55
coverage~=5.5
66
pre-commit~=2.17
77
pytest-cov~=3.0
8+
contributors-txt>=0.7.3
89
tbump~=6.3.2
910
types-typed-ast; implementation_name=="cpython" and python_version<"3.8"
1011
types-pkg_resources==0.1.3

script/.contributors_aliases.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
"name": "Marc Mueller",
1414
"team": "Maintainers"
1515
},
16+
17+
"mails": ["[email protected]"],
18+
"name": "Paligot Gérard"
19+
},
1620
1721
1822
"name": "Areveny",
@@ -82,6 +86,10 @@
8286
"name": "Hippo91",
8387
"team": "Maintainers"
8488
},
89+
90+
"mails": ["[email protected]"],
91+
"name": "Hugo van Kemenade"
92+
},
8593
8694
8795
"name": "Jacob Bogdanov"

0 commit comments

Comments
 (0)