Merge branch 'main' into main

Author: Pierre-Sassoulas

.coveragerc

@@ -7,12 +7,6 @@ include =
     pylint/*
 omit =
     */test/*
-# TODO: 3.0: Remove these after these files have been removed
-    pylint/config/configuration_mixin.py
-    pylint/config/option.py
-    pylint/config/option_manager_mixin.py
-    pylint/config/option_parser.py
-    pylint/config/options_provider_mixin.py
 exclude_lines =
     # Re-enable default pragma
     pragma: no cover

.gitattributes

@@ -0,0 +1,6 @@
+* text=auto
+tests/**/functional/** -text
+tests/input/** -text
+tests/**/data/** -text
+tests/regrtest_data/** -text
+doc/data/messages/u/unexpected-line-ending-format/bad.py -text

.github/CODEOWNERS

@@ -14,7 +14,7 @@ pylint/message/*    @pierre-sassoulas
 tests/message/*    @pierre-sassoulas
 
 # typing
-pylint/typing.py     @DanielNoord @cdce8p
+pylint/typing.py     @DanielNoord
 
 # multiprocessing (doublethefish is not yet a contributor with write access)
 # pylint/lint/parallel.py @doublethefish
@@ -26,11 +26,10 @@ tests/pyreverse/*    @DudeNr33
 
 ### Extensions
 
-# For any all
-pylint/extensions/for_any_all.py @areveny
-tests/functional/ext/for_any_all/* @areveny
+# CodeStyle
+pylint/extensions/code_style.* @cdce8p
+tests/functional/ext/code_style/* @cdce8p
 
-# Private import
-pylint/extensions/private_import.py @areveny
-tests/extensions/test_private_import.py @areveny
-tests/functional/ext/private_import/* @areveny
+# Typing
+pylint/extensions/typing.* @cdce8p
+tests/functional/ext/typing/* @cdce8p

.github/CONTRIBUTING.md

@@ -1,2 +1,2 @@
 Please read the
-[contribute doc](https://pylint.pycqa.org/en/latest/development_guide/contributor_guide/contribute.html).
+[contribute doc](https://pylint.readthedocs.io/en/latest/development_guide/contributor_guide/contribute.html).

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,11 +3,18 @@ Thank you for submitting a PR to pylint!
 
 To ease the process of reviewing your PR, do make sure to complete the following boxes.
 
-- [ ] Write a good description on what the PR does.
-- [ ] Create a news fragment with `towncrier create <IssueNumber>.<type>` which will be
-  included in the changelog. `<type>` can be one of: new_check, removed_check, extension,
-  false_positive, false_negative, bugfix, other, internal. If necessary you can write
-  details or offer examples on how the new change is supposed to work.
+- [ ] Document your change, if it is a non-trivial one.
+  - A maintainer might label the issue ``skip-news`` if the change does not need to be in the changelog.
+  - Otherwise, create a news fragment with ``towncrier create <IssueNumber>.<type>`` which will be
+    included in the changelog. ``<type>`` can be one of the types defined in `./towncrier.toml`.
+    If necessary you can write details or offer examples on how the new change is supposed to work.
+  - Generating the doc is done with ``tox -e docs``
+- [ ] Relate your change to an issue in the tracker if such an issue exists (Refs #1234, Closes #1234)
+- [ ] Write comprehensive commit messages and/or a good description of what the PR does.
+- [ ] Keep the change small, separate the consensual changes from the opinionated one.
+  Don't hesitate to open multiple PRs if the change requires it. If your review is so
+  big it requires to actually plan and allocate time to review, it's more likely
+  that it's going to go stale.
 - [ ] If you used multiple emails or multiple names when contributing, add your mails
       and preferred name in ``script/.contributors_aliases.json``
 -->

.github/workflows/backport.yml

@@ -0,0 +1,29 @@
+name: Backport
+on:
+  pull_request_target:
+    types:
+      - closed
+      - labeled
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  backport:
+    name: Backport
+    runs-on: ubuntu-latest
+    # Only react to merged PRs for security reasons.
+    # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
+    if: >
+      github.event.pull_request.merged && (
+        github.event.action == 'closed'
+        || (
+          github.event.action == 'labeled'
+          && contains(github.event.label.name, 'backport')
+        )
+      )
+    steps:
+      - uses: tibdex/backport@2e217641d82d02ba0603f46b1aeedefb258890ac # v2.0.3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/changelog.yml

@@ -3,11 +3,15 @@ name: changelog
 on:
   pull_request:
     types: [opened, synchronize, labeled, unlabeled, reopened]
-
+    branches-ignore:
+      - "maintenance/**"
 env:
-  # Also change CACHE_VERSION in the other workflows
-  CACHE_VERSION: 24
-  DEFAULT_PYTHON: "3.10"
+  CACHE_VERSION: 1
+  KEY_PREFIX: base-venv
+  DEFAULT_PYTHON: "3.11"
+
+permissions:
+  contents: read
 
 jobs:
   check-changelog:
@@ -17,32 +21,32 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v3.4.0
         with:
           # `towncrier check` runs `git diff --name-only origin/main...`, which
           # needs a non-shallow clone.
           fetch-depth: 0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.2.0
+        uses: actions/setup-python@v4.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
+          check-latest: true
       - name: Generate partial Python venv restore key
         id: generate-python-key
         run: >-
-          echo "::set-output name=key::base-venv-${{ env.CACHE_VERSION }}-${{
-            hashFiles('setup.cfg', 'requirements_test.txt', 'requirements_test_min.txt')
-          }}"
+          echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{
+            hashFiles('pyproject.toml', 'requirements_test.txt',
+          'requirements_test_min.txt', 'requirements_test_pre_commit.txt') }}" >>
+          $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.8
+        uses: actions/cache@v3.3.1
         with:
           path: venv
           key: >-
             ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             steps.generate-python-key.outputs.key }}
-          restore-keys: |
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-base-venv-${{ env.CACHE_VERSION }}-
       - name: Create Python virtual environment
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |

.github/workflows/checks.yaml

@@ -4,18 +4,25 @@ on:
   push:
     branches:
       - main
-      - 2.*
-  pull_request: ~
+      - "maintenance/**"
+  pull_request:
+    branches:
+      - main
+      - "maintenance/**"
 
 env:
-  CACHE_VERSION: 24
-  DEFAULT_PYTHON: "3.10"
+  CACHE_VERSION: 1
+  KEY_PREFIX: base-venv
+  DEFAULT_PYTHON: "3.11"
   PRE_COMMIT_CACHE: ~/.cache/pre-commit
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   prepare-base:
     name: Prepare base dependencies
@@ -26,28 +33,28 @@ jobs:
       pre-commit-key: ${{ steps.generate-pre-commit-key.outputs.key }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v3.4.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.2.0
+        uses: actions/setup-python@v4.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
+          check-latest: true
       - name: Generate partial Python venv restore key
         id: generate-python-key
         run: >-
-          echo "::set-output name=key::base-venv-${{ env.CACHE_VERSION }}-${{
-            hashFiles('setup.cfg', 'requirements_test.txt', 'requirements_test_min.txt')
-          }}"
+          echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{
+            hashFiles('pyproject.toml', 'requirements_test.txt',
+          'requirements_test_min.txt', 'requirements_test_pre_commit.txt') }}" >>
+          $GITHUB_OUTPUT
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.8
+        uses: actions/cache@v3.3.1
         with:
           path: venv
           key: >-
             ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             steps.generate-python-key.outputs.key }}
-          restore-keys: |
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-base-venv-${{ env.CACHE_VERSION }}-
       - name: Create Python virtual environment
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -59,17 +66,15 @@ jobs:
       - name: Generate pre-commit restore key
         id: generate-pre-commit-key
         run: >-
-          echo "::set-output name=key::pre-commit-${{ env.CACHE_VERSION }}-${{
-            hashFiles('.pre-commit-config.yaml') }}"
+          echo "key=pre-commit-${{ env.CACHE_VERSION }}-${{
+            hashFiles('.pre-commit-config.yaml') }}" >> $GITHUB_OUTPUT
       - name: Restore pre-commit environment
         id: cache-precommit
-        uses: actions/cache@v3.0.8
+        uses: actions/cache@v3.3.1
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           key: >-
             ${{ runner.os }}-${{ steps.generate-pre-commit-key.outputs.key }}
-          restore-keys: |
-            ${{ runner.os }}-pre-commit-${{ env.CACHE_VERSION }}-
       - name: Install pre-commit dependencies
         if: steps.cache-precommit.outputs.cache-hit != 'true'
         run: |
@@ -83,44 +88,38 @@ jobs:
     needs: prepare-base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v3.4.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.2.0
+        uses: actions/setup-python@v4.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
+          check-latest: true
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.8
+        uses: actions/cache@v3.3.1
         with:
           path: venv
+          fail-on-cache-miss: true
           key:
             ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.prepare-base.outputs.python-key }}
-      - name: Fail job if Python cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          echo "Failed to restore Python venv from cache"
-          exit 1
       - name: Restore pre-commit environment
         id: cache-precommit
-        uses: actions/cache@v3.0.8
+        uses: actions/cache@v3.3.1
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
+          fail-on-cache-miss: true
           key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
-      - name: Fail job if pre-commit cache restore failed
-        if: steps.cache-precommit.outputs.cache-hit != 'true'
-        run: |
-          echo "Failed to restore pre-commit environment from cache"
-          exit 1
       - name: Install enchant and aspell
         run: |
           sudo apt-get update
-          sudo apt-get install enchant aspell-en
+          sudo apt-get install enchant-2 aspell-en
       - name: Run pylint checks
         run: |
           . venv/bin/activate
           pip install -e .
+          pip list | grep 'astroid\|pylint'
           pre-commit run --hook-stage manual pylint-with-spelling --all-files
 
   spelling:
@@ -130,25 +129,22 @@ jobs:
     needs: prepare-base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v3.4.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.2.0
+        uses: actions/setup-python@v4.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
+          check-latest: true
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.8
+        uses: actions/cache@v3.3.1
         with:
           path: venv
+          fail-on-cache-miss: true
           key:
             ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.prepare-base.outputs.python-key }}
-      - name: Fail job if Python cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          echo "Failed to restore Python venv from cache"
-          exit 1
       - name: Run spelling checks
         run: |
           . venv/bin/activate
@@ -157,29 +153,26 @@ jobs:
   documentation:
     name: documentation
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     needs: prepare-base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v3.4.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.2.0
+        uses: actions/setup-python@v4.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
+          check-latest: true
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.8
+        uses: actions/cache@v3.3.1
         with:
           path: venv
+          fail-on-cache-miss: true
           key:
             ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.prepare-base.outputs.python-key }}
-      - name: Fail job if Python cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          echo "Failed to restore Python venv from cache"
-          exit 1
       - name: Install tox
         run: |
           pip install -U tox

.github/workflows/codeql-analysis.yml

@@ -20,6 +20,13 @@ on:
   schedule:
     - cron: "44 16 * * 4"
 
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze
@@ -39,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v3.4.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL