Merge branch 'main' of https://github.com/PyCQA/astroid into orelse-lineno

Author: DanielNoord

.github/workflows/ci.yaml

@@ -81,7 +81,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
     outputs:
       python-key: ${{ steps.generate-python-key.outputs.key }}
     steps:
@@ -92,6 +92,10 @@ jobs:
         uses: actions/setup-python@v3.1.2
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Install Qt
+        if: ${{ matrix.python-version == '3.10' }}
+        run: |
+          sudo apt-get install build-essential libgl1-mesa-dev
       - name: Generate partial Python venv restore key
         id: generate-python-key
         run: >-
@@ -229,7 +233,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
     steps:
       - name: Set temp directory
         run: echo "TEMP=$env:USERPROFILE\AppData\Local\Temp" >> $env:GITHUB_ENV
@@ -278,7 +282,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["pypy-3.6", "pypy-3.7", "pypy-3.8"]
+        python-version: ["pypy-3.7", "pypy-3.8"]
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v3.0.2

.github/workflows/codeql-analysis.yml

@@ -43,7 +43,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2

.github/workflows/release-tests.yml

@@ -5,6 +5,9 @@ on: workflow_dispatch
 env:
   DEFAULT_PYTHON: 3.8
 
+permissions:
+  contents: read
+
 jobs:
   virtualenv-15-windows-test:
     # Regression test added in https://github.com/PyCQA/astroid/pull/1386
@@ -31,31 +34,3 @@ jobs:
           . venv2\scripts\activate
           echo "import distutils.util  # pylint: disable=unused-import" > test.py
           pylint test.py
-
-  additional-dependencies-linux-tests:
-    name: Regression tests w/ additional dependencies (Linux)
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v3.0.2
-      - name: Set up Python
-        id: python
-        uses: actions/setup-python@v3.1.0
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-      - name: Install Qt
-        run: |
-          sudo apt-get install build-essential libgl1-mesa-dev
-      - name: Create Python virtual environment
-        run: |
-          python -m venv venv
-          . venv/bin/activate
-          python -m pip install -U pip setuptools wheel
-          pip install -U -r requirements_test.txt -r requirements_test_brain.txt
-          pip install -e .
-      - name: Run brain_qt tests
-        # Regression test added in https://github.com/PyCQA/astroid/pull/1505
-        run: |
-          . venv/bin/activate
-          pytest tests/unittest_brain_qt.py

.github/workflows/release.yml

@@ -8,6 +8,9 @@ on:
 env:
   DEFAULT_PYTHON: 3.9
 
+permissions:
+  contents: read
+
 jobs:
   release-pypi:
     name: Upload release to PyPI

.pre-commit-config.yaml

@@ -28,11 +28,11 @@ repos:
         exclude: tests/testdata|setup.py
         types: [python]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.32.0
+    rev: v2.32.1
     hooks:
       - id: pyupgrade
         exclude: tests/testdata
-        args: [--py36-plus]
+        args: [--py37-plus]
   - repo: https://github.com/PyCQA/isort
     rev: 5.10.1
     hooks:
@@ -71,7 +71,7 @@ repos:
           ]
         exclude: tests/testdata|conf.py
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.942
+    rev: v0.950
     hooks:
       - id: mypy
         name: mypy

CONTRIBUTORS.txt

@@ -67,7 +67,6 @@ Contributors
 - Peter Kolbus <peter.kolbus@gmail.com>
 - Omer Katz <omer.drow@gmail.com>
 - Moises Lopez <moylop260@vauxoo.com>
-- Michael <michael-k@users.noreply.github.com>
 - Keichi Takahashi <keichi.t@me.com>
 - Kavins Singh <kavinsingh@hotmail.com>
 - Karthikeyan Singaravelan <tir.karthi@gmail.com>

ChangeLog

@@ -6,6 +6,8 @@ What's New in astroid 2.12.0?
 =============================
 Release date: TBA
 
+* ``astroid`` now requires Python 3.7.2 to run.
+
 * Add ``orelse_lineno`` and ``orelse_col_offset`` attributes to ``nodes.If``.
 
 * Fix ``re`` brain on Python ``3.11``. The flags now come from ``re._compile``.
@@ -15,16 +17,54 @@ Release date: TBA
 
   Closes #1512
 
+* Allowed ``AstroidManager.clear_cache`` to reload necessary brain plugins.
+
 * Rename ``ModuleSpec`` -> ``module_type`` constructor parameter to match attribute
   name and improve typing. Use ``type`` instead.
 
+* Infer the return value of the ``.copy()`` method on ``dict``, ``list``, ``set``,
+  and ``frozenset``.
 
-What's New in astroid 2.11.4?
+  Closes #1403
+
+What's New in astroid 2.11.6?
 =============================
 Release date: TBA
 
+
+What's New in astroid 2.11.5?
+=============================
+Release date: 2022-05-09
+
+* Fix crash while obtaining ``object_type()`` of an ``Unknown`` node.
+
+  Refs PyCQA/pylint#6539
+
+* Fix a bug where in attempting to handle the patching of ``distutils`` by ``virtualenv``,
+  library submodules called ``distutils`` (e.g. ``numpy.distutils``) were included also.
+
+  Refs PyCQA/pylint#6497
+
+What's New in astroid 2.11.4?
+=============================
+Release date: 2022-05-02
+
 * Fix ``col_offset`` attribute for nodes involving ``with`` on ``PyPy``.
 
+* Fixed a crash involving two starred expressions: one inside a comprehension,
+  both inside a call.
+
+  Refs PyCQA/pylint#6372
+
+* Made ``FunctionDef.implicit_parameters`` return 1 for methods by making
+  ``FunctionDef.is_bound`` return ``True``, as it does for class methods.
+
+  Closes PyCQA/pylint#6464
+
+* Fixed a crash when ``_filter_stmts`` encounters an ``EmptyNode``.
+
+  Closes PyCQA/pylint#6438
+
 
 What's New in astroid 2.11.3?
 =============================

astroid/__init__.py

@@ -33,7 +33,6 @@
 import functools
 import tokenize
 from importlib import import_module
-from pathlib import Path
 
 # isort: off
 # We have an isort: off on '__version__' because the packaging need to access
@@ -49,7 +48,7 @@
 from astroid.bases import BaseInstance, BoundMethod, Instance, UnboundMethod
 from astroid.brain.helpers import register_module_extender
 from astroid.builder import extract_node, parse
-from astroid.const import PY310_PLUS, Context, Del, Load, Store
+from astroid.const import BRAIN_MODULES_DIRECTORY, PY310_PLUS, Context, Del, Load, Store
 from astroid.exceptions import (
     AstroidBuildingError,
     AstroidBuildingException,
@@ -193,8 +192,6 @@
     tokenize._compile = functools.lru_cache()(tokenize._compile)  # type: ignore[attr-defined]
 
 # load brain plugins
-ASTROID_INSTALL_DIRECTORY = Path(__file__).parent
-BRAIN_MODULES_DIRECTORY = ASTROID_INSTALL_DIRECTORY / "brain"
 for module in BRAIN_MODULES_DIRECTORY.iterdir():
     if module.suffix == ".py":
         import_module(f"astroid.brain.{module.stem}")

astroid/brain/brain_builtin_inference.py

@@ -4,8 +4,9 @@
 
 """Astroid hooks for various builtins."""
 
+import itertools
 from functools import partial
-from typing import Optional
+from typing import Iterator, Optional
 
 from astroid import arguments, helpers, inference_tip, nodes, objects, util
 from astroid.builder import AstroidBuilder
@@ -892,6 +893,22 @@ def _build_dict_with_elements(elements):
     return _build_dict_with_elements([])
 
 
+def _infer_copy_method(
+    node: nodes.Call, context: Optional[InferenceContext] = None
+) -> Iterator[nodes.NodeNG]:
+    assert isinstance(node.func, nodes.Attribute)
+    inferred_orig, inferred_copy = itertools.tee(node.func.expr.infer(context=context))
+    if all(
+        isinstance(
+            inferred_node, (nodes.Dict, nodes.List, nodes.Set, objects.FrozenSet)
+        )
+        for inferred_node in inferred_orig
+    ):
+        return inferred_copy
+
+    raise UseInferenceDefault()
+
+
 # Builtins inference
 register_builtin_transform(infer_bool, "bool")
 register_builtin_transform(infer_super, "super")
@@ -920,3 +937,10 @@ def _build_dict_with_elements(elements):
     inference_tip(_infer_object__new__decorator),
     _infer_object__new__decorator_check,
 )
+
+AstroidManager().register_transform(
+    nodes.Call,
+    inference_tip(_infer_copy_method),
+    lambda node: isinstance(node.func, nodes.Attribute)
+    and node.func.attrname == "copy",
+)

astroid/brain/brain_crypt.py

@@ -4,25 +4,22 @@
 
 from astroid.brain.helpers import register_module_extender
 from astroid.builder import parse
-from astroid.const import PY37_PLUS
 from astroid.manager import AstroidManager
 
-if PY37_PLUS:
-    # Since Python 3.7 Hashing Methods are added
-    # dynamically to globals()
 
-    def _re_transform():
-        return parse(
-            """
-        from collections import namedtuple
-        _Method = namedtuple('_Method', 'name ident salt_chars total_size')
-
-        METHOD_SHA512 = _Method('SHA512', '6', 16, 106)
-        METHOD_SHA256 = _Method('SHA256', '5', 16, 63)
-        METHOD_BLOWFISH = _Method('BLOWFISH', 2, 'b', 22)
-        METHOD_MD5 = _Method('MD5', '1', 8, 34)
-        METHOD_CRYPT = _Method('CRYPT', None, 2, 13)
+def _re_transform():
+    return parse(
         """
-        )
+    from collections import namedtuple
+    _Method = namedtuple('_Method', 'name ident salt_chars total_size')
+
+    METHOD_SHA512 = _Method('SHA512', '6', 16, 106)
+    METHOD_SHA256 = _Method('SHA256', '5', 16, 63)
+    METHOD_BLOWFISH = _Method('BLOWFISH', 2, 'b', 22)
+    METHOD_MD5 = _Method('MD5', '1', 8, 34)
+    METHOD_CRYPT = _Method('CRYPT', None, 2, 13)
+    """
+    )
+
 
-    register_module_extender(AstroidManager(), "crypt", _re_transform)
+register_module_extender(AstroidManager(), "crypt", _re_transform)