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

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

+3
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ Contributors
114114
115115
116116
- adam-grant-hendry <[email protected]>
117+
117118
- Zbigniew Jędrzejewski-Szmek <[email protected]>
118119
- Zac Hatfield-Dodds <[email protected]>
119120
- Vilnis Termanis <[email protected]>
@@ -122,6 +123,7 @@ Contributors
122123
- Tomas Novak <[email protected]>
123124
- Thirumal Venkat <[email protected]>
124125
- SupImDos <[email protected]>
126+
- Stéphane Brunner <[email protected]>
125127
- Stanislav Levin <[email protected]>
126128
- Simon Hewitt <[email protected]>
127129
- Serhiy Storchaka <[email protected]>
@@ -185,6 +187,7 @@ Contributors
185187
- Cole Robinson <[email protected]>
186188
- Christoph Reiter <[email protected]>
187189
- Chris Philip <[email protected]>
190+
- Charlie Ringström <[email protected]>
188191
- BioGeek <[email protected]>
189192
- Bianca Power <[email protected]>
190193
- Benjamin Elven <[email protected]>

ChangeLog

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
{
2-
3-
"mails": ["[email protected]"],
4-
"name": "Charlie Ringström"
5-
},
62
73
"mails": ["[email protected]"],
84
"name": "correctmost"
@@ -85,6 +81,10 @@
8581
"name": "Bryce Guinta",
8682
"team": "Maintainers"
8783
},
84+
85+
"mails": ["[email protected]"],
86+
"name": "Charlie Ringström"
87+
},
8888
8989
9090
"name": "Calen Pennington"

0 commit comments

Comments
 (0)