Merge branch 'main' into issue-6895

pylint-dev · Jun 13, 2022 · 1f33e33 · 1f33e33
2 parents 2b4382c + c21261e
commit 1f33e33
Show file tree

Hide file tree

Showing 103 changed files with 861 additions and 337 deletions.
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Generate partial Python venv restore key
@@ -41,7 +41,7 @@ jobs:
           }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key: >-
@@ -64,7 +64,7 @@ jobs:
             hashFiles('.pre-commit-config.yaml') }}"
       - name: Restore pre-commit environment
         id: cache-precommit
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           key: >-
@@ -87,12 +87,12 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key:
@@ -105,7 +105,7 @@ jobs:
           exit 1
       - name: Restore pre-commit environment
         id: cache-precommit
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
@@ -134,12 +134,12 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key:
@@ -165,12 +165,12 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key:

diff --git a/.github/workflows/primer-test.yaml b/.github/workflows/primer-test.yaml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Generate partial Python venv restore key
@@ -46,7 +46,7 @@ jobs:
           }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key: >-
@@ -75,12 +75,12 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key:
@@ -110,12 +110,12 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key:

diff --git a/.github/workflows/primer_comment.yaml b/.github/workflows/primer_comment.yaml
@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python 3.10
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: "3.10"
 
@@ -45,7 +45,7 @@ jobs:
           }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key: >-
@@ -111,7 +111,7 @@ jobs:
       - name: Compare outputs
         run: |
           . venv/bin/activate
-          python tests/primer/primer_tool.py compare \
+          python tests/primer/__main__.py compare \
           --commit=${{ github.event.workflow_run.head_sha }} \
           --base-file=output_${{ steps.python.outputs.python-version }}_main.txt \
           --new-file=output_${{ steps.python.outputs.python-version }}_pr.txt

diff --git a/.github/workflows/primer_run_main.yaml b/.github/workflows/primer_run_main.yaml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -49,7 +49,7 @@ jobs:
           'astroid_sha.txt') }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key: >-
@@ -72,12 +72,12 @@ jobs:
         id: commitstring
         run: |
           . venv/bin/activate
-          python tests/primer/primer_tool.py prepare --make-commit-string
-          output=$(python tests/primer/primer_tool.py prepare --read-commit-string)
+          python tests/primer/__main__.py prepare --make-commit-string
+          output=$(python tests/primer/__main__.py prepare --read-commit-string)
           echo "::set-output name=commitstring::$output"
       - name: Restore projects cache
         id: cache-projects
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: tests/.pylint_primer_tests/
           key: >-
@@ -86,7 +86,7 @@ jobs:
       - name: Regenerate cache
         run: |
           . venv/bin/activate
-          python tests/primer/primer_tool.py prepare --clone
+          python tests/primer/__main__.py prepare --clone
       - name: Upload output diff
         uses: actions/upload-artifact@v3
         with:
@@ -98,7 +98,7 @@ jobs:
         run: |
           . venv/bin/activate
           pip install -e .
-          python tests/primer/primer_tool.py run --type=main 2>warnings.txt
+          python tests/primer/__main__.py run --type=main 2>warnings.txt
           WARNINGS=$(head -c 65000 < warnings.txt)
           if [[ $WARNINGS ]]
           then echo "::warning ::$WARNINGS"

diff --git a/.github/workflows/primer_run_pr.yaml b/.github/workflows/primer_run_pr.yaml
@@ -41,7 +41,7 @@ jobs:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - uses: actions/setup-node@v3
@@ -64,7 +64,7 @@ jobs:
           'astroid_sha.txt') }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key: >-
@@ -141,11 +141,11 @@ jobs:
         id: commitstring
         run: |
           . venv/bin/activate
-          output=$(python tests/primer/primer_tool.py prepare --read-commit-string)
+          output=$(python tests/primer/__main__.py prepare --read-commit-string)
           echo "::set-output name=commitstring::$output"
       - name: Restore projects cache
         id: cache-projects
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: tests/.pylint_primer_tests/
           key: >-
@@ -154,7 +154,7 @@ jobs:
       - name: Check cache
         run: |
           . venv/bin/activate
-          python tests/primer/primer_tool.py prepare --check
+          python tests/primer/__main__.py prepare --check
 
       # Merge the 'main' commit of last successful run
       - name: Pull 'main'
@@ -169,7 +169,7 @@ jobs:
         run: |
           . venv/bin/activate
           pip install -e .
-          python tests/primer/primer_tool.py run --type=pr 2>warnings.txt
+          python tests/primer/__main__.py run --type=pr 2>warnings.txt
           WARNINGS=$(head -c 65000 < warnings.txt)
           if [[ $WARNINGS ]]
           then echo "::warning ::$WARNINGS"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Install requirements

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Generate partial Python venv restore key
@@ -40,7 +40,7 @@ jobs:
           }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key: >-
@@ -84,12 +84,12 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key:
@@ -128,12 +128,12 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key:
@@ -184,7 +184,7 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Generate partial Python venv restore key
@@ -195,7 +195,7 @@ jobs:
           }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key: >-
@@ -230,7 +230,7 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Generate partial Python venv restore key
@@ -241,7 +241,7 @@ jobs:
           }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key: >-
@@ -274,7 +274,7 @@ jobs:
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v3.1.2
+        uses: actions/setup-python@v4.0.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Generate partial Python venv restore key
@@ -285,7 +285,7 @@ jobs:
           }}"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.3
+        uses: actions/cache@v3.0.4
         with:
           path: venv
           key: >-

diff --git a/doc/data/messages/b/bad-inline-option/bad.py b/doc/data/messages/b/bad-inline-option/bad.py
@@ -0,0 +1,2 @@
+# 2:[bad-inline-option]
+# pylint: disable line-too-long
diff --git a/doc/data/messages/b/bad-inline-option/details.rst b/doc/data/messages/b/bad-inline-option/details.rst
diff --git a/doc/data/messages/b/bad-inline-option/good.py b/doc/data/messages/b/bad-inline-option/good.py
@@ -1 +1 @@
-# This is a placeholder for correct code for this message.
+# pylint: disable=line-too-long
diff --git a/doc/data/messages/c/consider-iterating-dictionary/bad.py b/doc/data/messages/c/consider-iterating-dictionary/bad.py
@@ -0,0 +1,5 @@
+FRUITS = {"apple": 1, "pear": 5, "peach": 10}
+
+
+for fruit in FRUITS.keys():  # [consider-iterating-dictionary]
+    print(fruit)
diff --git a/doc/data/messages/c/consider-iterating-dictionary/details.rst b/doc/data/messages/c/consider-iterating-dictionary/details.rst
diff --git a/doc/data/messages/c/consider-iterating-dictionary/good.py b/doc/data/messages/c/consider-iterating-dictionary/good.py
@@ -1 +1,5 @@
-# This is a placeholder for correct code for this message.
+FRUITS = {"apple": 1, "pear": 5, "peach": 10}
+
+
+for fruit in FRUITS:
+    print(fruit)
diff --git a/doc/data/messages/e/empty-comment/bad.py b/doc/data/messages/e/empty-comment/bad.py
@@ -0,0 +1,5 @@
+# +1:[empty-comment]
+#
+
+# +1:[empty-comment]
+x = 0  #
diff --git a/doc/data/messages/e/empty-comment/details.rst b/doc/data/messages/e/empty-comment/details.rst