Skip to content

Commit 52c3ecc

Browse files
authored
Merge pull request #75 from pylint-dev/ci/updates/2024-07
See more details in #75
2 parents 8310a88 + f951f11 commit 52c3ecc

File tree

6 files changed

+166
-123
lines changed

6 files changed

+166
-123
lines changed

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ci:
44

55
repos:
66
- repo: https://github.com/pre-commit/pre-commit-hooks
7-
rev: v4.5.0
7+
rev: v4.6.0
88
hooks:
99
- id: end-of-file-fixer
1010
exclude: ^.idea/
@@ -35,18 +35,18 @@ repos:
3535
- --offset
3636
- '2'
3737
- repo: https://github.com/astral-sh/ruff-pre-commit
38-
rev: v0.3.0
38+
rev: v0.5.1
3939
hooks:
4040
- id: ruff
4141
args:
4242
- --fix
4343
exclude: tests/input/
4444
- repo: https://github.com/psf/black
45-
rev: 24.2.0
45+
rev: 24.4.2
4646
hooks:
4747
- id: black
4848
- repo: https://github.com/asottile/blacken-docs
49-
rev: 1.16.0
49+
rev: 1.18.0
5050
hooks:
5151
- id: blacken-docs
5252
additional_dependencies:

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ requirements/dev.txt: .venv requirements/dev.in
1616
--quiet --generate-hashes --max-rounds=20 --strip-extras \
1717
--resolver=backtracking \
1818
--output-file requirements/dev.txt \
19+
pyproject.toml \
1920
requirements/dev.in
2021

2122
# upgrades the dependencies to their latest/matching version
@@ -26,6 +27,7 @@ upgrade: .venv
2627
--upgrade \
2728
--resolver=backtracking \
2829
--output-file requirements/dev.txt \
30+
pyproject.toml \
2931
requirements/dev.in
3032

3133

pyproject.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,14 @@ check_untyped_defs = true
138138
addopts = "--verbose --cov-config=pyproject.toml --cov-report=html"
139139

140140
[tool.ruff]
141+
fix = true
141142
# ruff is less lenient than pylint and does not make any exceptions
142143
# (for docstrings, strings and comments in particular).
143144
line-length = 100
144145

146+
target-version = "py38"
147+
148+
[tool.ruff.lint]
145149
select = [
146150
"E", # pycodestyle
147151
"F", # pyflakes
@@ -156,12 +160,10 @@ ignore = [
156160
"RUF012", # Mutable class attributes should be annotated with `typing.ClassVar`
157161
]
158162

159-
target-version = "py38"
160-
161-
[tool.ruff.pydocstyle]
163+
[tool.ruff.lint.pydocstyle]
162164
convention = "google"
163165

164-
[tool.ruff.extend-per-file-ignores]
166+
[tool.ruff.lint.extend-per-file-ignores]
165167
"tests/**/test_*.py" = [
166168
"S101", # pytest works with `assert`s
167169
"FBT", # Don't care about booleans as positional arguments in tests, e.g. via @pytest.mark.parametrize()
@@ -178,7 +180,6 @@ convention = "google"
178180
]
179181

180182
[tool.pylint]
181-
182183
py-version = "3.8"
183184

184185
ignore-paths="tests/input" # Ignore test inputs

requirements/dev.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ wheel
99
pre-commit
1010

1111
# used to run tests
12+
tox
1213
pytest
1314
pytest-cov

0 commit comments

Comments
 (0)