Skip to content

Commit 3636bc2

Browse files
Merge pull request #2732 from pylint-dev/merge-maintenance-into-main
Merge maintenance into main following 3.3.10 release
2 parents 2408316 + 4bec758 commit 3636bc2

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repos:
1010
- id: end-of-file-fixer
1111
exclude: tests/testdata
1212
- repo: https://github.com/astral-sh/ruff-pre-commit
13-
rev: "v0.11.8"
13+
rev: "v0.11.9"
1414
hooks:
1515
- id: ruff
1616
args: ["--fix"]

CONTRIBUTORS.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ Contributors
114114
- grayjk <grayjk@gmail.com>
115115
- alm <alonme@users.noreply.github.com>
116116
- adam-grant-hendry <59346180+adam-grant-hendry@users.noreply.github.com>
117+
- aatle <168398276+aatle@users.noreply.github.com>
117118
- Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
118119
- Zac Hatfield-Dodds <Zac-HD@users.noreply.github.com>
119120
- Vilnis Termanis <vilnis.termanis@iotics.com>
@@ -122,6 +123,7 @@ Contributors
122123
- Tomas Novak <ext.Tomas.Novak@skoda-auto.cz>
123124
- Thirumal Venkat <me@thirumal.in>
124125
- SupImDos <62866982+SupImDos@users.noreply.github.com>
126+
- Stéphane Brunner <stephane.brunner@camptocamp.com>
125127
- Stanislav Levin <slev@altlinux.org>
126128
- Simon Hewitt <si@sjhewitt.co.uk>
127129
- Serhiy Storchaka <storchaka@gmail.com>
@@ -185,6 +187,7 @@ Contributors
185187
- Cole Robinson <crobinso@redhat.com>
186188
- Christoph Reiter <reiter.christoph@gmail.com>
187189
- Chris Philip <chrisp533@gmail.com>
190+
- Charlie Ringström <34444482+Chasarr@users.noreply.github.com>
188191
- BioGeek <jeroen.vangoey@gmail.com>
189192
- Bianca Power <30207144+biancapower@users.noreply.github.com>
190193
- Benjamin Elven <25181435+S3ntinelX@users.noreply.github.com>

ChangeLog

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,16 @@ Release date: TBA
3333
Closes #2513
3434

3535

36-
What's New in astroid 3.3.10?
36+
What's New in astroid 3.3.11?
3737
=============================
3838
Release date: TBA
3939

40+
41+
42+
What's New in astroid 3.3.10?
43+
=============================
44+
Release date: 2025-05-10
45+
4046
* Avoid importing submodules sharing names with standard library modules.
4147

4248
Closes #2684

script/.contributors_aliases.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
{
2-
"c.ringstrom@gmail.com": {
3-
"mails": ["c.ringstrom@gmail.com"],
4-
"name": "Charlie Ringström"
5-
},
62
"134317971+correctmost@users.noreply.github.com": {
73
"mails": ["134317971+correctmost@users.noreply.github.com"],
84
"name": "correctmost"
@@ -85,6 +81,10 @@
8581
"name": "Bryce Guinta",
8682
"team": "Maintainers"
8783
},
84+
"c.ringstrom@gmail.com": {
85+
"mails": ["c.ringstrom@gmail.com"],
86+
"name": "Charlie Ringström"
87+
},
8888
"calen.pennington@gmail.com": {
8989
"mails": ["cale@edx.org", "calen.pennington@gmail.com"],
9090
"name": "Calen Pennington"

0 commit comments

Comments
 (0)