Skip to content

Commit b0b9139

Browse files
authored
Merge branch 'pylint-dev:main' into per_directory_configs
2 parents 5fd935c + 10a093e commit b0b9139

26 files changed

+167
-56
lines changed

.github/workflows/changelog.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
timeout-minutes: 10
2222
steps:
2323
- name: Check out code from GitHub
24-
uses: actions/[email protected].1
24+
uses: actions/[email protected].2
2525
with:
2626
# `towncrier check` runs `git diff --name-only origin/main...`, which
2727
# needs a non-shallow clone.
@@ -41,7 +41,7 @@ jobs:
4141
$GITHUB_OUTPUT
4242
- name: Restore Python virtual environment
4343
id: cache-venv
44-
uses: actions/[email protected].0
44+
uses: actions/[email protected].2
4545
with:
4646
path: venv
4747
key: >-

.github/workflows/checks.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
pre-commit-key: ${{ steps.generate-pre-commit-key.outputs.key }}
3434
steps:
3535
- name: Check out code from GitHub
36-
uses: actions/[email protected].1
36+
uses: actions/[email protected].2
3737
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
3838
id: python
3939
uses: actions/[email protected]
@@ -49,7 +49,7 @@ jobs:
4949
$GITHUB_OUTPUT
5050
- name: Restore Python virtual environment
5151
id: cache-venv
52-
uses: actions/[email protected].0
52+
uses: actions/[email protected].2
5353
with:
5454
path: venv
5555
key: >-
@@ -71,7 +71,7 @@ jobs:
7171
hashFiles('.pre-commit-config.yaml') }}" >> $GITHUB_OUTPUT
7272
- name: Restore pre-commit environment
7373
id: cache-precommit
74-
uses: actions/[email protected].0
74+
uses: actions/[email protected].2
7575
with:
7676
path: ${{ env.PRE_COMMIT_CACHE }}
7777
key: >-
@@ -89,7 +89,7 @@ jobs:
8989
needs: prepare-base
9090
steps:
9191
- name: Check out code from GitHub
92-
uses: actions/[email protected].1
92+
uses: actions/[email protected].2
9393
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
9494
id: python
9595
uses: actions/[email protected]
@@ -98,7 +98,7 @@ jobs:
9898
check-latest: true
9999
- name: Restore Python virtual environment
100100
id: cache-venv
101-
uses: actions/[email protected].0
101+
uses: actions/[email protected].2
102102
with:
103103
path: venv
104104
fail-on-cache-miss: true
@@ -107,7 +107,7 @@ jobs:
107107
needs.prepare-base.outputs.python-key }}
108108
- name: Restore pre-commit environment
109109
id: cache-precommit
110-
uses: actions/[email protected].0
110+
uses: actions/[email protected].2
111111
with:
112112
path: ${{ env.PRE_COMMIT_CACHE }}
113113
fail-on-cache-miss: true
@@ -130,7 +130,7 @@ jobs:
130130
needs: prepare-base
131131
steps:
132132
- name: Check out code from GitHub
133-
uses: actions/[email protected].1
133+
uses: actions/[email protected].2
134134
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
135135
id: python
136136
uses: actions/[email protected]
@@ -139,7 +139,7 @@ jobs:
139139
check-latest: true
140140
- name: Restore Python virtual environment
141141
id: cache-venv
142-
uses: actions/[email protected].0
142+
uses: actions/[email protected].2
143143
with:
144144
path: venv
145145
fail-on-cache-miss: true
@@ -158,7 +158,7 @@ jobs:
158158
needs: prepare-base
159159
steps:
160160
- name: Check out code from GitHub
161-
uses: actions/[email protected].1
161+
uses: actions/[email protected].2
162162
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
163163
id: python
164164
uses: actions/[email protected]
@@ -167,7 +167,7 @@ jobs:
167167
check-latest: true
168168
- name: Restore Python virtual environment
169169
id: cache-venv
170-
uses: actions/[email protected].0
170+
uses: actions/[email protected].2
171171
with:
172172
path: venv
173173
fail-on-cache-miss: true

.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
steps:
5050
- name: Checkout repository
51-
uses: actions/[email protected].1
51+
uses: actions/[email protected].2
5252

5353
# Initializes the CodeQL tools for scanning.
5454
- name: Initialize CodeQL

.github/workflows/primer-test.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
python-key: ${{ steps.generate-python-key.outputs.key }}
3636
steps:
3737
- name: Check out code from GitHub
38-
uses: actions/[email protected].1
38+
uses: actions/[email protected].2
3939
- name: Set up Python ${{ matrix.python-version }}
4040
id: python
4141
uses: actions/[email protected]
@@ -51,7 +51,7 @@ jobs:
5151
$GITHUB_OUTPUT
5252
- name: Restore Python virtual environment
5353
id: cache-venv
54-
uses: actions/[email protected].0
54+
uses: actions/[email protected].2
5555
with:
5656
path: venv
5757
key: >-
@@ -75,7 +75,7 @@ jobs:
7575
python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
7676
steps:
7777
- name: Check out code from GitHub
78-
uses: actions/[email protected].1
78+
uses: actions/[email protected].2
7979
- name: Set up Python ${{ matrix.python-version }}
8080
id: python
8181
uses: actions/[email protected]
@@ -84,7 +84,7 @@ jobs:
8484
check-latest: true
8585
- name: Restore Python virtual environment
8686
id: cache-venv
87-
uses: actions/[email protected].0
87+
uses: actions/[email protected].2
8888
with:
8989
path: venv
9090
fail-on-cache-miss: true

.github/workflows/primer_comment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Check out code from GitHub
33-
uses: actions/[email protected].1
33+
uses: actions/[email protected].2
3434
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
3535
id: python
3636
uses: actions/[email protected]
@@ -41,7 +41,7 @@ jobs:
4141
# Restore cached Python environment
4242
- name: Restore Python virtual environment
4343
id: cache-venv
44-
uses: actions/[email protected].0
44+
uses: actions/[email protected].2
4545
with:
4646
path: venv
4747
key:

.github/workflows/primer_run_main.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
batchIdx: [0, 1, 2, 3]
3535
steps:
3636
- name: Check out code from GitHub
37-
uses: actions/[email protected].1
37+
uses: actions/[email protected].2
3838
- name: Set up Python ${{ matrix.python-version }}
3939
id: python
4040
uses: actions/[email protected]
@@ -45,7 +45,7 @@ jobs:
4545
# Create a re-usable virtual environment
4646
- name: Create Python virtual environment cache
4747
id: cache-venv
48-
uses: actions/[email protected].0
48+
uses: actions/[email protected].2
4949
with:
5050
path: venv
5151
key:
@@ -71,7 +71,7 @@ jobs:
7171
echo "commitstring=$output" >> $GITHUB_OUTPUT
7272
- name: Restore projects cache
7373
id: cache-projects
74-
uses: actions/[email protected].0
74+
uses: actions/[email protected].2
7575
with:
7676
path: tests/.pylint_primer_tests/
7777
key: >-

.github/workflows/primer_run_pr.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
batchIdx: [0, 1, 2, 3]
4444
steps:
4545
- name: Check out code from GitHub
46-
uses: actions/[email protected].1
46+
uses: actions/[email protected].2
4747
with:
4848
fetch-depth: 0
4949
- name: Set up Python ${{ matrix.python-version }}
@@ -56,7 +56,7 @@ jobs:
5656
# Restore cached Python environment
5757
- name: Restore Python virtual environment
5858
id: cache-venv
59-
uses: actions/[email protected].0
59+
uses: actions/[email protected].2
6060
with:
6161
path: venv
6262
key:
@@ -140,7 +140,7 @@ jobs:
140140
echo "commitstring=$output" >> $GITHUB_OUTPUT
141141
- name: Restore projects cache
142142
id: cache-projects
143-
uses: actions/[email protected].0
143+
uses: actions/[email protected].2
144144
with:
145145
path: tests/.pylint_primer_tests/
146146
key: >-

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
url: https://pypi.org/project/pylint/
2121
steps:
2222
- name: Check out code from Github
23-
uses: actions/[email protected].1
23+
uses: actions/[email protected].2
2424
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
2525
id: python
2626
uses: actions/[email protected]

.github/workflows/tests.yaml

+13-13
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
python-key: ${{ steps.generate-python-key.outputs.key }}
3737
steps:
3838
- name: Check out code from GitHub
39-
uses: actions/[email protected].1
39+
uses: actions/[email protected].2
4040
- name: Set up Python ${{ matrix.python-version }}
4141
id: python
4242
uses: actions/[email protected]
@@ -52,7 +52,7 @@ jobs:
5252
$GITHUB_OUTPUT
5353
- name: Restore Python virtual environment
5454
id: cache-venv
55-
uses: actions/[email protected].0
55+
uses: actions/[email protected].2
5656
with:
5757
path: venv
5858
key: >-
@@ -88,7 +88,7 @@ jobs:
8888
needs: tests-linux
8989
steps:
9090
- name: Check out code from GitHub
91-
uses: actions/[email protected].1
91+
uses: actions/[email protected].2
9292
- name: Set up Python 3.12
9393
id: python
9494
uses: actions/[email protected]
@@ -97,15 +97,15 @@ jobs:
9797
check-latest: true
9898
- name: Restore Python virtual environment
9999
id: cache-venv
100-
uses: actions/[email protected].0
100+
uses: actions/[email protected].2
101101
with:
102102
path: venv
103103
fail-on-cache-miss: true
104104
key:
105105
${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
106106
needs.tests-linux.outputs.python-key }}
107107
- name: Download all coverage artifacts
108-
uses: actions/[email protected].2
108+
uses: actions/[email protected].4
109109
- name: Combine coverage results
110110
run: |
111111
. venv/bin/activate
@@ -128,7 +128,7 @@ jobs:
128128
python-version: ["3.12"]
129129
steps:
130130
- name: Check out code from GitHub
131-
uses: actions/[email protected].1
131+
uses: actions/[email protected].2
132132
- name: Set up Python ${{ matrix.python-version }}
133133
id: python
134134
uses: actions/[email protected]
@@ -137,7 +137,7 @@ jobs:
137137
check-latest: true
138138
- name: Restore Python virtual environment
139139
id: cache-venv
140-
uses: actions/[email protected].0
140+
uses: actions/[email protected].2
141141
with:
142142
path: venv
143143
fail-on-cache-miss: true
@@ -182,7 +182,7 @@ jobs:
182182
# Workaround to set correct temp directory on Windows
183183
# https://github.com/actions/virtual-environments/issues/712
184184
- name: Check out code from GitHub
185-
uses: actions/[email protected].1
185+
uses: actions/[email protected].2
186186
- name: Set up Python ${{ matrix.python-version }}
187187
id: python
188188
uses: actions/[email protected]
@@ -197,7 +197,7 @@ jobs:
197197
}}" >> $env:GITHUB_OUTPUT
198198
- name: Restore Python virtual environment
199199
id: cache-venv
200-
uses: actions/[email protected].0
200+
uses: actions/[email protected].2
201201
with:
202202
path: venv
203203
key: >-
@@ -228,7 +228,7 @@ jobs:
228228
python-version: [3.8]
229229
steps:
230230
- name: Check out code from GitHub
231-
uses: actions/[email protected].1
231+
uses: actions/[email protected].2
232232
- name: Set up Python ${{ matrix.python-version }}
233233
id: python
234234
uses: actions/[email protected]
@@ -243,7 +243,7 @@ jobs:
243243
}}" >> $GITHUB_OUTPUT
244244
- name: Restore Python virtual environment
245245
id: cache-venv
246-
uses: actions/[email protected].0
246+
uses: actions/[email protected].2
247247
with:
248248
path: venv
249249
key: >-
@@ -272,7 +272,7 @@ jobs:
272272
python-version: ["pypy-3.8", "pypy-3.9"]
273273
steps:
274274
- name: Check out code from GitHub
275-
uses: actions/[email protected].1
275+
uses: actions/[email protected].2
276276
- name: Set up Python ${{ matrix.python-version }}
277277
id: python
278278
uses: actions/[email protected]
@@ -287,7 +287,7 @@ jobs:
287287
}}" >> $GITHUB_OUTPUT
288288
- name: Restore Python virtual environment
289289
id: cache-venv
290-
uses: actions/[email protected].0
290+
uses: actions/[email protected].2
291291
with:
292292
path: venv
293293
key: >-

.pre-commit-config.yaml

+12-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ repos:
1717
doc/data/messages/m/missing-final-newline/bad/crlf.py
1818
)$
1919
- repo: https://github.com/astral-sh/ruff-pre-commit
20-
rev: "v0.2.2"
20+
rev: "v0.3.2"
2121
hooks:
2222
- id: ruff
2323
args: ["--fix"]
@@ -87,7 +87,15 @@ repos:
8787
entry: pylint
8888
language: system
8989
types: [python]
90-
args: ["-rn", "-sn", "--rcfile=pylintrc", "--fail-on=I", "--spelling-dict=en"]
90+
args:
91+
[
92+
"-rn",
93+
"-sn",
94+
"--rcfile=pylintrc",
95+
"--fail-on=I",
96+
"--spelling-dict=en",
97+
"--output-format=github",
98+
]
9199
exclude: tests(/\w*)*/functional/|tests/input|tests(/\w*)*data/|doc/
92100
stages: [manual]
93101
- id: sphinx-generated-doc
@@ -112,7 +120,7 @@ repos:
112120
files: ^(doc/(.*/)*.*\.rst)
113121
additional_dependencies: [Sphinx==5.0.1]
114122
- repo: https://github.com/pre-commit/mirrors-mypy
115-
rev: v1.8.0
123+
rev: v1.9.0
116124
hooks:
117125
- id: mypy
118126
name: mypy
@@ -158,7 +166,7 @@ repos:
158166
setup.cfg
159167
)$
160168
- repo: https://github.com/PyCQA/bandit
161-
rev: 1.7.7
169+
rev: 1.7.8
162170
hooks:
163171
- id: bandit
164172
args: ["-r", "-lll"]

0 commit comments

Comments
 (0)