Merge branch 'maintenance/3.3.x' into main following 3.3.10 release

Pierre-Sassoulas · Pierre-Sassoulas · commit 4bec7587c535 · 2025-05-10T16:13:44.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: end-of-file-fixer
         exclude: tests/testdata
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.11.8"
+    rev: "v0.11.9"
     hooks:
       - id: ruff
         args: ["--fix"]
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -114,6 +114,7 @@ Contributors
 - grayjk <grayjk@gmail.com>
 - alm <alonme@users.noreply.github.com>
 - adam-grant-hendry <59346180+adam-grant-hendry@users.noreply.github.com>
+- aatle <168398276+aatle@users.noreply.github.com>
 - Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
 - Zac Hatfield-Dodds <Zac-HD@users.noreply.github.com>
 - Vilnis Termanis <vilnis.termanis@iotics.com>
@@ -122,6 +123,7 @@ Contributors
 - Tomas Novak <ext.Tomas.Novak@skoda-auto.cz>
 - Thirumal Venkat <me@thirumal.in>
 - SupImDos <62866982+SupImDos@users.noreply.github.com>
+- Stéphane Brunner <stephane.brunner@camptocamp.com>
 - Stanislav Levin <slev@altlinux.org>
 - Simon Hewitt <si@sjhewitt.co.uk>
 - Serhiy Storchaka <storchaka@gmail.com>
@@ -185,6 +187,7 @@ Contributors
 - Cole Robinson <crobinso@redhat.com>
 - Christoph Reiter <reiter.christoph@gmail.com>
 - Chris Philip <chrisp533@gmail.com>
+- Charlie Ringström <34444482+Chasarr@users.noreply.github.com>
 - BioGeek <jeroen.vangoey@gmail.com>
 - Bianca Power <30207144+biancapower@users.noreply.github.com>
 - Benjamin Elven <25181435+S3ntinelX@users.noreply.github.com>
diff --git a/ChangeLog b/ChangeLog
@@ -33,10 +33,16 @@ Release date: TBA
   Closes #2513
 
 
-What's New in astroid 3.3.10?
+What's New in astroid 3.3.11?
 =============================
 Release date: TBA
 
+
+
+What's New in astroid 3.3.10?
+=============================
+Release date: 2025-05-10
+
 * Avoid importing submodules sharing names with standard library modules.
 
   Closes #2684
diff --git a/script/.contributors_aliases.json b/script/.contributors_aliases.json
@@ -1,8 +1,4 @@
 {
-  "c.ringstrom@gmail.com": {
-    "mails": ["c.ringstrom@gmail.com"],
-    "name": "Charlie Ringström"
-  },
   "134317971+correctmost@users.noreply.github.com": {
     "mails": ["134317971+correctmost@users.noreply.github.com"],
     "name": "correctmost"
@@ -85,6 +81,10 @@
     "name": "Bryce Guinta",
     "team": "Maintainers"
   },
+  "c.ringstrom@gmail.com": {
+    "mails": ["c.ringstrom@gmail.com"],
+    "name": "Charlie Ringström"
+  },
   "calen.pennington@gmail.com": {
     "mails": ["cale@edx.org", "calen.pennington@gmail.com"],
     "name": "Calen Pennington"

-Original file line number
+Diff line change
 - grayjk <[email protected]>
 - alm <[email protected]>
 - adam-grant-hendry <[email protected]>
 +- aatle <[email protected]>
 - Zbigniew Jędrzejewski-Szmek <[email protected]>
 - Zac Hatfield-Dodds <[email protected]>
 - Vilnis Termanis <[email protected]>
 - Tomas Novak <[email protected]>
 - Thirumal Venkat <[email protected]>
 - SupImDos <[email protected]>
 +- Stéphane Brunner <[email protected]>
 - Stanislav Levin <[email protected]>
 - Simon Hewitt <[email protected]>
 - Serhiy Storchaka <[email protected]>
 - Cole Robinson <[email protected]>
 - Christoph Reiter <[email protected]>
 - Chris Philip <[email protected]>
 +- Charlie Ringström <[email protected]>
 - BioGeek <[email protected]>
 - Bianca Power <[email protected]>
 - Benjamin Elven <[email protected]>
-Original file line number
+Diff line change
@@ @@ -1,8 +1,4 @@ @@
+{
 -  "[email protected]": {
 -    "mails": ["[email protected]"],
 -    "name": "Charlie Ringström"
 -  },
   "[email protected]": {
     "mails": ["[email protected]"],
     "name": "correctmost"
     "name": "Bryce Guinta",
     "team": "Maintainers"
   },
 +  "[email protected]": {
 +    "mails": ["[email protected]"],
 +    "name": "Charlie Ringström"
 +  },
   "[email protected]": {
     "mails": ["[email protected]", "[email protected]"],
     "name": "Calen Pennington"