Merge branch 'main' into collections-fix

Author: DanielNoord

.github/workflows/ci.yaml

@@ -10,7 +10,7 @@ on:
 env:
   CACHE_VERSION: 3
   KEY_PREFIX: venv
-  DEFAULT_PYTHON: "3.12"
+  DEFAULT_PYTHON: "3.13"
   PRE_COMMIT_CACHE: ~/.cache/pre-commit
 
 concurrency:
@@ -24,10 +24,10 @@ jobs:
     timeout-minutes: 20
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.1.1
+        uses: actions/setup-python@v5.3.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -39,7 +39,7 @@ jobs:
           'requirements_full.txt', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4.1.2
         with:
           path: venv
           key: >-
@@ -59,7 +59,7 @@ jobs:
             hashFiles('.pre-commit-config.yaml') }}" >> $GITHUB_OUTPUT
       - name: Restore pre-commit environment
         id: cache-precommit
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4.1.2
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           key: >-
@@ -81,15 +81,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9, "3.10", "3.11", "3.12", "3.13-dev"]
+        python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
     outputs:
       python-key: ${{ steps.generate-python-key.outputs.key }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.1.1
+        uses: actions/setup-python@v5.3.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -106,7 +106,7 @@ jobs:
           'requirements_full.txt', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4.1.2
         with:
           path: venv
           key: >-
@@ -117,18 +117,19 @@ jobs:
         run: |
           python -m venv venv
           . venv/bin/activate
-          python -m pip install -U pip setuptools wheel
+          python -m pip install -U pip wheel
           pip install -U -r requirements_full.txt
           pip install -e .
       - name: Run pytest
         run: |
           . venv/bin/activate
           pytest --cov
       - name: Upload coverage artifact
-        uses: actions/upload-artifact@v4.3.4
+        uses: actions/upload-artifact@v4.5.0
         with:
           name: coverage-linux-${{ matrix.python-version }}
           path: .coverage
+          include-hidden-files: true
 
   tests-windows:
     name: tests / run / ${{ matrix.python-version }} / Windows
@@ -138,17 +139,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9, "3.10", "3.11", "3.12", "3.13-dev"]
+        python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
     steps:
       - name: Set temp directory
         run: echo "TEMP=$env:USERPROFILE\AppData\Local\Temp" >> $env:GITHUB_ENV
         # Workaround to set correct temp directory on Windows
         # https://github.com/actions/virtual-environments/issues/712
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.1.1
+        uses: actions/setup-python@v5.3.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -160,7 +161,7 @@ jobs:
           'requirements_full.txt', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4.1.2
         with:
           path: venv
           key: >-
@@ -179,10 +180,11 @@ jobs:
           . venv\\Scripts\\activate
           pytest --cov
       - name: Upload coverage artifact
-        uses: actions/upload-artifact@v4.3.4
+        uses: actions/upload-artifact@v4.5.0
         with:
           name: coverage-windows-${{ matrix.python-version }}
           path: .coverage
+          include-hidden-files: true
 
   tests-pypy:
     name: tests / run / ${{ matrix.python-version }} / Linux
@@ -195,10 +197,10 @@ jobs:
         python-version: ["pypy3.9", "pypy3.10"]
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.1.1
+        uses: actions/setup-python@v5.3.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -210,7 +212,7 @@ jobs:
           }}" >> $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.0.2
+        uses: actions/cache@v4.1.2
         with:
           path: venv
           key: >-
@@ -229,10 +231,11 @@ jobs:
           . venv/bin/activate
           pytest --cov
       - name: Upload coverage artifact
-        uses: actions/upload-artifact@v4.3.4
+        uses: actions/upload-artifact@v4.5.0
         with:
           name: coverage-pypy-${{ matrix.python-version }}
           path: .coverage
+          include-hidden-files: true
 
   coverage:
     name: tests / process / coverage
@@ -241,12 +244,12 @@ jobs:
     needs: ["tests-linux", "tests-windows", "tests-pypy"]
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.7
-      - name: Set up Python 3.12
+        uses: actions/checkout@v4.2.2
+      - name: Set up Python 3.13
         id: python
-        uses: actions/setup-python@v5.1.1
+        uses: actions/setup-python@v5.3.0
         with:
-          python-version: "3.12"
+          python-version: "3.13"
           check-latest: true
       - name: Install dependencies
         run: pip install -U -r requirements_minimal.txt
@@ -256,7 +259,7 @@ jobs:
         run: |
           coverage combine coverage-linux*/.coverage
           coverage xml -o coverage-linux.xml
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
@@ -267,7 +270,7 @@ jobs:
         run: |
           coverage combine coverage-windows*/.coverage
           coverage xml -o coverage-windows.xml
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
@@ -278,7 +281,7 @@ jobs:
         run: |
           coverage combine coverage-pypy*/.coverage
           coverage xml -o coverage-pypy.xml
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true

.github/workflows/codeql-analysis.yml

@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/release-tests.yml

@@ -13,10 +13,10 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
       - name: Set up Python 3.9
         id: python
-        uses: actions/setup-python@v5.1.1
+        uses: actions/setup-python@v5.3.0
         with:
           # virtualenv 15.1.0 cannot be installed on Python 3.10+
           python-version: 3.9

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
       - published
 
 env:
-  DEFAULT_PYTHON: "3.12"
+  DEFAULT_PYTHON: "3.13"
 
 permissions:
   contents: read
@@ -20,10 +20,10 @@ jobs:
       url: https://pypi.org/project/astroid/
     steps:
       - name: Check out code from Github
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.1.1
+        uses: actions/setup-python@v5.3.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true

.pre-commit-config.yaml

@@ -3,17 +3,16 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
         exclude: .github/|tests/testdata
       - id: end-of-file-fixer
         exclude: tests/testdata
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.5.5"
+    rev: "v0.8.4"
     hooks:
       - id: ruff
-        exclude: tests/testdata
         args: ["--fix"]
   - repo: https://github.com/Pierre-Sassoulas/copyright_notice_precommit
     rev: 0.1.2
@@ -23,7 +22,7 @@ repos:
         exclude: tests/testdata|setup.py
         types: [python]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.17.0
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         exclude: tests/testdata
@@ -34,7 +33,7 @@ repos:
       - id: black-disable-checker
         exclude: tests/test_nodes_lineno.py
   - repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 24.10.0
     hooks:
       - id: black
         args: [--safe, --quiet]
@@ -53,19 +52,14 @@ repos:
             "--output-format=github",
             # "--load-plugins=pylint.extensions.docparams", We're not ready for that
           ]
-        exclude: tests/testdata|conf.py
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.11.0
+    rev: v1.14.0
     hooks:
       - id: mypy
-        name: mypy
-        entry: mypy
         language: python
-        types: [python]
-        args: []
+        pass_filenames: false
         require_serial: true
         additional_dependencies: ["types-typed-ast"]
-        exclude: tests/testdata| # exclude everything, we're not ready
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v4.0.0-alpha.8
     hooks:

CONTRIBUTORS.txt

@@ -32,29 +32,33 @@ Contributors
 ------------
 - Emile Anclin <[email protected]>
 - Nick Drozd <[email protected]>
+- correctmost <[email protected]>
 - Andrew Haigh <[email protected]>
 - Julien Cristau <[email protected]>
 - David Liu <[email protected]>
 - Alexandre Fayolle <[email protected]>
 - Eevee (Alex Munroe) <[email protected]>
+- temyurchenko <[email protected]>
 - David Gilman <[email protected]>
 - Tushar Sadhwani <[email protected]>
 - Julien Jehannet <[email protected]>
 - Calen Pennington <[email protected]>
 - Antonio <[email protected]>
 - Hugo van Kemenade <[email protected]>
+- Artem Yurchenko <[email protected]>
 - Tim Martin <[email protected]>
 - Phil Schaf <[email protected]>
 - Alex Hall <[email protected]>
 - Raphael Gaschignard <[email protected]>
 - Radosław Ganczarek <[email protected]>
 - Paligot Gérard <[email protected]>
 - Ioana Tagirta <[email protected]>
+- Eric Vergnaud <[email protected]>
 - Derek Gustafson <[email protected]>
 - David Shea <[email protected]>
 - Daniel Harding <[email protected]>
 - Christian Clauss <[email protected]>
-- correctmost <[email protected].com>
+- Akhil Kamat <akhil.kamat@gmail.com>
 - Ville Skyttä <[email protected]>
 - Rene Zhang <[email protected]>
 - Philip Lorenz <[email protected]>
@@ -72,6 +76,7 @@ Contributors
 - [email protected] <[email protected]>
 - doranid <[email protected]>
 - brendanator <[email protected]>
+- akamat10 <[email protected]>
 - Tomas Gavenciak <[email protected]>
 - Tim Paine <[email protected]>
 - Thomas Hisch <[email protected]>
@@ -136,6 +141,7 @@ Contributors
 - Miro Hrončok <[email protected]>
 - Michał Masłowski <[email protected]>
 - Mateusz Bysiek <[email protected]>
+- Matej Aleksandrov <[email protected]>
 - Marcelo Trylesinski <[email protected]>
 - Leandro T. C. Melo <[email protected]>
 - Konrad Weihmann <[email protected]>
@@ -166,7 +172,6 @@ Contributors
 - Francis Charette Migneault <[email protected]>
 - Felix Mölder <[email protected]>
 - Federico Bond <[email protected]>
-- Eric Vergnaud <[email protected]>
 - DudeNr33 <[email protected]>
 - Dmitry Shachnev <[email protected]>
 - Denis Laxalde <[email protected]>