Merge branch 'pylint-dev:main' into main

pylint-dev · Jan 3, 2025 · fc701c4 · fc701c4
2 parents bb9d9d1 + c21276f
commit fc701c4
Show file tree

Hide file tree

Showing 21 changed files with 91 additions and 53 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -41,7 +41,7 @@ jobs:
           $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: venv
           key: >-

diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -49,7 +49,7 @@ jobs:
           $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: venv
           key: >-
@@ -71,7 +71,7 @@ jobs:
             hashFiles('.pre-commit-config.yaml') }}" >> $GITHUB_OUTPUT
       - name: Restore pre-commit environment
         id: cache-precommit
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           key: >-
@@ -98,7 +98,7 @@ jobs:
           check-latest: true
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: venv
           fail-on-cache-miss: true
@@ -107,7 +107,7 @@ jobs:
             needs.prepare-base.outputs.python-key }}
       - name: Restore pre-commit environment
         id: cache-precommit
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -139,7 +139,7 @@ jobs:
           check-latest: true
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: venv
           fail-on-cache-miss: true
@@ -167,7 +167,7 @@ jobs:
           check-latest: true
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: venv
           fail-on-cache-miss: true

diff --git a/.github/workflows/primer-test.yaml b/.github/workflows/primer-test.yaml
@@ -51,7 +51,7 @@ jobs:
           $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: venv
           key: >-
@@ -84,7 +84,7 @@ jobs:
           check-latest: true
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: venv
           fail-on-cache-miss: true

diff --git a/.github/workflows/primer_comment.yaml b/.github/workflows/primer_comment.yaml
@@ -41,7 +41,7 @@ jobs:
       # Restore cached Python environment
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: venv
           key:

diff --git a/.github/workflows/primer_run_main.yaml b/.github/workflows/primer_run_main.yaml
@@ -45,7 +45,7 @@ jobs:
       # Create a re-usable virtual environment
       - name: Restore Python virtual environment cache
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.2.0
         with:
           path: venv
           key:
@@ -63,7 +63,7 @@ jobs:
       # Save cached Python environment (explicit because cancel-in-progress: true)
       - name: Save Python virtual environment to cache
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4.1.2
+        uses: actions/cache/save@v4.2.0
         with:
           path: venv
           key:
@@ -82,7 +82,7 @@ jobs:
           echo "commitstring=$output" >> $GITHUB_OUTPUT
       - name: Restore projects cache
         id: cache-projects
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.2.0
         with:
           path: tests/.pylint_primer_tests/
           key: >-
@@ -95,14 +95,14 @@ jobs:
           python tests/primer/__main__.py prepare --clone
       - name: Save projects cache
         if: steps.cache-projects.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4.1.2
+        uses: actions/cache/save@v4.2.0
         with:
           path: tests/.pylint_primer_tests/
           key: >-
             ${{ runner.os }}-${{ matrix.python-version }}-${{
             steps.commitstring.outputs.commitstring }}-primer
       - name: Upload commit string
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.5.0
         if: matrix.batchIdx == 0
         with:
           name: primer_commitstring_${{ matrix.python-version }}
@@ -123,7 +123,7 @@ jobs:
           then echo "::warning ::$WARNINGS"
           fi
       - name: Upload output
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.5.0
         with:
           name:
             primer_output_main_${{ matrix.python-version }}_batch${{ matrix.batchIdx }}

diff --git a/.github/workflows/primer_run_pr.yaml b/.github/workflows/primer_run_pr.yaml
@@ -56,7 +56,7 @@ jobs:
       # Restore cached Python environment
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.2.0
         with:
           path: venv
           key:
@@ -75,7 +75,7 @@ jobs:
       # Save cached Python environment (explicit because cancel-in-progress: true)
       - name: Save Python virtual environment
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4.1.2
+        uses: actions/cache/save@v4.2.0
         with:
           path: venv
           key:
@@ -151,7 +151,7 @@ jobs:
           echo "commitstring=$output" >> $GITHUB_OUTPUT
       - name: Restore projects cache
         id: cache-projects
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.2.0
         with:
           path: tests/.pylint_primer_tests/
           key: >-
@@ -164,7 +164,7 @@ jobs:
           python tests/primer/__main__.py prepare --clone
       - name: Save projects cache
         if: steps.cache-projects.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4.1.2
+        uses: actions/cache/save@v4.2.0
         with:
           path: tests/.pylint_primer_tests/
           key: >-
@@ -197,15 +197,15 @@ jobs:
           then echo "::warning ::$WARNINGS"
           fi
       - name: Upload output of PR
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.5.0
         with:
           name:
             primer_output_pr_${{ matrix.python-version }}_batch${{ matrix.batchIdx }}
           path:
             tests/.pylint_primer_tests/output_${{ matrix.python-version }}_pr_batch${{
             matrix.batchIdx }}.txt
       - name: Upload output of 'main'
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.5.0
         with:
           name:
             primer_output_main_${{ matrix.python-version }}_batch${{ matrix.batchIdx }}
@@ -218,7 +218,7 @@ jobs:
       - name: Upload PR number
         if:
           startsWith(steps.python.outputs.python-version, '3.9') && matrix.batchIdx == 0
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.5.0
         with:
           name: pr_number
           path: pr_number.txt
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -52,7 +52,7 @@ jobs:
           $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: venv
           key: >-
@@ -76,7 +76,7 @@ jobs:
           pip list | grep 'astroid\|pylint'
           python -m pytest -vv --minimal-messages-config tests/test_functional.py
       - name: Upload coverage artifact
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.5.0
         with:
           name: coverage-${{ matrix.python-version }}
           include-hidden-files: true
@@ -98,7 +98,7 @@ jobs:
           check-latest: true
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: venv
           fail-on-cache-miss: true
@@ -138,7 +138,7 @@ jobs:
           check-latest: true
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: venv
           fail-on-cache-miss: true
@@ -161,7 +161,7 @@ jobs:
         run: >-
           echo "datetime="$(date "+%Y%m%d_%H%M") >> $GITHUB_OUTPUT
       - name: Upload benchmark artifact
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.5.0
         with:
           name:
             benchmark-${{ runner.os }}-${{ matrix.python-version }}_${{
@@ -199,7 +199,7 @@ jobs:
           }}" >> $env:GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: venv
           key: >-
@@ -245,7 +245,7 @@ jobs:
           }}" >> $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: venv
           key: >-
@@ -289,7 +289,7 @@ jobs:
           }}" >> $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.2.0
         with:
           path: venv
           key: >-

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -20,7 +20,7 @@ repos:
             doc/data/messages/m/missing-final-newline/bad/crlf.py
           )$
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.8.1"
+    rev: "v0.8.4"
     hooks:
       - id: ruff
         args: ["--fix"]
@@ -125,7 +125,7 @@ repos:
         files: ^(doc/(.*/)*.*\.rst)
         additional_dependencies: [Sphinx==7.4.3]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.13.0
+    rev: v1.14.0
     hooks:
       - id: mypy
         name: mypy
@@ -140,11 +140,11 @@ repos:
             "platformdirs==2.2.0",
             "py==1.11",
             "tomlkit>=0.10.1",
-            "types-pkg_resources==0.1.3",
+            "types-setuptools==75.6.0.20241126",
           ]
         exclude: tests(/\w*)*/functional/|tests/input|tests(/.*)+/conftest.py|doc/data/messages|tests(/\w*)*data/
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.4.1
+    rev: v3.4.2
     hooks:
       - id: prettier
         args: [--prose-wrap=always, --print-width=88]

diff --git a/doc/development_guide/contributor_guide/tests/launching_test.rst b/doc/development_guide/contributor_guide/tests/launching_test.rst
@@ -30,7 +30,7 @@ tox
 You can also *optionally* install tox_ and run our tests using the tox_ package, as in::
 
     python -m tox
-    python -m tox -epy312 # for Python 3.12 suite only
+    python -m tox -epy313 # for Python 3.13 suite only
     python -m tox -epylint # for running Pylint over Pylint's codebase
     python -m tox -eformatting # for running formatting checks over Pylint's codebase
 

diff --git a/doc/whatsnew/3/3.3/index.rst b/doc/whatsnew/3/3.3/index.rst
@@ -14,6 +14,35 @@ Summary -- Release highlights
 
 .. towncrier release notes start
 
+What's new in Pylint 3.3.3?
+---------------------------
+Release date: 2024-12-23
+
+
+False Positives Fixed
+---------------------
+
+- Fix false positives for ``undefined-variable`` for classes using Python 3.12
+  generic type syntax.
+
+  Closes #9335 (`#9335 <https://github.com/pylint-dev/pylint/issues/9335>`_)
+
+- Fix a false positive for `use-implicit-booleaness-not-len`. No lint should be emitted for
+  generators (`len` is not defined for generators).
+
+  Refs #10100 (`#10100 <https://github.com/pylint-dev/pylint/issues/10100>`_)
+
+
+
+Other Bug Fixes
+---------------
+
+- Fix ``Unable to import 'collections.abc' (import-error)`` on Python 3.13.1.
+
+  Closes #10112 (`#10112 <https://github.com/pylint-dev/pylint/issues/10112>`_)
+
+
+
 What's new in Pylint 3.3.2?
 ---------------------------
 Release date: 2024-12-01

diff --git a/doc/whatsnew/fragments/10100.false_positive b/doc/whatsnew/fragments/10100.false_positive
diff --git a/pylint/checkers/variables.py b/pylint/checkers/variables.py
@@ -1742,6 +1742,11 @@ def _should_node_be_skipped(
             if utils.is_ancestor_name(consumer.node, node) or (
                 not is_start_index and self._ignore_class_scope(node)
             ):
+                if any(
+                    node.name == param.name.name for param in consumer.node.type_params
+                ):
+                    return False
+
                 return True
 
             # Ignore inner class scope for keywords in class definition
@@ -1952,7 +1957,9 @@ def _check_consumer(
                 )
             return (VariableVisitConsumerAction.RETURN, found_nodes)
 
-        elif isinstance(defstmt, nodes.ClassDef):
+        elif (
+            isinstance(defstmt, nodes.ClassDef) and defnode not in defframe.type_params
+        ):
             return self._is_first_level_self_reference(node, defstmt, found_nodes)
 
         elif isinstance(defnode, nodes.NamedExpr):
@@ -2334,6 +2341,13 @@ def _is_variable_violation(
                     maybe_before_assign = defnode.value is node or any(
                         anc is defnode.value for anc in node.node_ancestors()
                     )
+                elif (
+                    isinstance(defframe, nodes.ClassDef)
+                    and defnode in defframe.type_params
+                ):
+                    # Generic on parent class:
+                    # class Child[_T](Parent[_T])
+                    maybe_before_assign = False
 
         return maybe_before_assign, annotation_return, use_outer_definition