Skip to content

Commit 43d32d2

Browse files
Pierre-Sassoulasgithub-actions[bot]cdce8ppylint-backport-bot[bot]mharding-hpe
authored
Merge maintenance into main following 3.3.11 release (#2779)
* [fix] Crash when parsing an empty arbitrary expression with ``extract_node`` (#2736) (#2737) Closes #2734 (cherry picked from commit 59f36e7) Co-authored-by: Pierre Sassoulas <pierre.sassoulas@gmail.com> * [fix] Prevent crash on slice decorator for 'six' decorated function (#2738) (#2740) Closes #2721 (cherry picked from commit 555a128) Co-authored-by: Pierre Sassoulas <pierre.sassoulas@gmail.com> * [Backport maintenance/3.3.x] Initial fixes for Python 3.14 (#2747) (#2748) (cherry picked from commit 43111bb) * Improve backport job permissions (#2750) (cherry picked from commit fe5bb6c) * Use custom Github App to authenticate backport job (#2751) (#2752) (cherry picked from commit a6f8d6a) Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> * Include subclasses of standard property classes as property decorators (#2735) * Include subclasses of standard property types as property decorators * Modify astroid.bases and tests.test_nodes to reflect that enum.property was added in Python 3.11, not 3.10 * Apply suggestions from code review Co-authored-by: Pierre Sassoulas <pierre.sassoulas@gmail.com> --------- Co-authored-by: Pierre Sassoulas <pierre.sassoulas@gmail.com> (cherry picked from commit 30128b7) * Bump astroid to 3.3.11, update changelog (#2777) --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: pylint-backport-bot[bot] <212256041+pylint-backport-bot[bot]@users.noreply.github.com> Co-authored-by: Mitch Harding <mitchell.harding@hpe.com>
2 parents c94e0b7 + db2b389 commit 43d32d2

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

CONTRIBUTORS.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Contributors
3535
- correctmost <134317971+correctmost@users.noreply.github.com>
3636
- Andrew Haigh <hello@nelf.in>
3737
- Julien Cristau <julien.cristau@logilab.fr>
38-
- David Liu <david@cs.toronto.edu>
3938
- Artem Yurchenko <44875844+temyurchenko@users.noreply.github.com>
39+
- David Liu <david@cs.toronto.edu>
4040
- Alexandre Fayolle <alexandre.fayolle@logilab.fr>
4141
- Eevee (Alex Munroe) <amunroe@yelp.com>
4242
- David Gilman <davidgilman1@gmail.com>
@@ -72,6 +72,7 @@ Contributors
7272
- Dani Alcala <112832187+clavedeluna@users.noreply.github.com>
7373
- Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
7474
- tristanlatr <19967168+tristanlatr@users.noreply.github.com>
75+
- grayjk <grayjk@gmail.com>
7576
- emile@crater.logilab.fr <emile@crater.logilab.fr>
7677
- doranid <ddandd@gmail.com>
7778
- brendanator <brendan.maginnis@gmail.com>
@@ -87,6 +88,7 @@ Contributors
8788
- Peter Kolbus <peter.kolbus@gmail.com>
8889
- Omer Katz <omer.drow@gmail.com>
8990
- Moises Lopez <moylop260@vauxoo.com>
91+
- Mitch Harding <mitchell.harding@hpe.com>
9092
- Michal Vasilek <michal@vasilek.cz>
9193
- Keichi Takahashi <keichi.t@me.com>
9294
- Kavins Singh <kavinsingh@hotmail.com>
@@ -102,16 +104,17 @@ Contributors
102104
- Anthony Sottile <asottile@umich.edu>
103105
- Alexander Shadchin <alexandr.shadchin@gmail.com>
104106
- wgehalo <wgehalo@gmail.com>
107+
- tejaschauhan36912 <59693377+tejaschauhan36912@users.noreply.github.com>
105108
- rr- <rr-@sakuya.pl>
106109
- raylu <lurayl@gmail.com>
107110
- plucury <plucury@gmail.com>
111+
- pavan-msys <149513767+pavan-msys@users.noreply.github.com>
108112
- ostr00000 <ostr00000@gmail.com>
109113
- noah-weingarden <33741795+noah-weingarden@users.noreply.github.com>
110114
- nathannaveen <42319948+nathannaveen@users.noreply.github.com>
111115
- mathieui <mathieui@users.noreply.github.com>
112116
- markmcclain <markmcclain@users.noreply.github.com>
113117
- ioanatia <ioanatia@users.noreply.github.com>
114-
- grayjk <grayjk@gmail.com>
115118
- alm <alonme@users.noreply.github.com>
116119
- adam-grant-hendry <59346180+adam-grant-hendry@users.noreply.github.com>
117120
- aatle <168398276+aatle@users.noreply.github.com>

ChangeLog

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,15 @@ Release date: TBA
4646

4747
Refs #2765
4848

49-
What's New in astroid 3.3.11?
50-
=============================
51-
Release date: TBA
52-
5349
* Fix a crash when the root of a node is not a module but is unknown.
5450

5551
Closes #2672
5652

53+
54+
What's New in astroid 3.3.11?
55+
=============================
56+
Release date: 2025-07-13
57+
5758
* Fix a crash when parsing an empty arbitrary expression with ``extract_node`` (``extract_node("__()")``).
5859

5960
Closes #2734

script/.contributors_aliases.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@
7272
"mails": [
7373
"66853113+pre-commit-ci[bot]@users.noreply.github.com",
7474
"49699333+dependabot[bot]@users.noreply.github.com",
75-
"41898282+github-actions[bot]@users.noreply.github.com"
75+
"41898282+github-actions[bot]@users.noreply.github.com",
76+
"212256041+pylint-backport-bot[bot]@users.noreply.github.com"
7677
],
7778
"name": "bot"
7879
},
@@ -103,6 +104,10 @@
103104
"mails": ["david@dropbox.com", "github@euresti.com"],
104105
"name": "David Euresti"
105106
},
107+
"grayjk@gmail.com": {
108+
"mails": ["grayjk@gmail.com"],
109+
"name": "grayjk"
110+
},
106111
"guillaume.peillex@gmail.com": {
107112
"mails": ["guillaume.peillex@gmail.com"],
108113
"name": "Hippo91",

0 commit comments

Comments
 (0)