Skip to content

Commit 2a10334

Browse files
committed
# Conflicts: # .flake8 # LICENSE # pyproject.toml
2 parents 705a757 + d2ec047 commit 2a10334

File tree

4 files changed

+4
-27
lines changed

4 files changed

+4
-27
lines changed

.flake8

Lines changed: 0 additions & 10 deletions
This file was deleted.

pyproject.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ addopts = "--black"
1313
[tool.pytest-enabler.mypy]
1414
addopts = "--mypy"
1515

16-
[tool.pytest-enabler.flake8]
17-
# disabled due to PyCQA/flake8#1438
18-
# addopts = "--flake8"
19-
2016
[tool.pytest-enabler.cov]
2117
addopts = "--cov"
18+
19+
[tool.pytest-enabler.ruff]
20+
addopts = "--ruff"

pytest.ini

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,11 @@ filterwarnings=
77
# Ensure ResourceWarnings are emitted
88
default::ResourceWarning
99

10-
# Suppress deprecation warning in flake8
11-
ignore:SelectableGroups dict interface is deprecated::flake8
12-
1310
# shopkeep/pytest-black#55
1411
ignore:<class 'pytest_black.BlackItem'> is not using a cooperative constructor:pytest.PytestDeprecationWarning
1512
ignore:The \(fspath. py.path.local\) argument to BlackItem is deprecated.:pytest.PytestDeprecationWarning
1613
ignore:BlackItem is an Item subclass and should not be a collector:pytest.PytestWarning
1714

18-
# tholo/pytest-flake8#83
19-
ignore:<class 'pytest_flake8.Flake8Item'> is not using a cooperative constructor:pytest.PytestDeprecationWarning
20-
ignore:The \(fspath. py.path.local\) argument to Flake8Item is deprecated.:pytest.PytestDeprecationWarning
21-
ignore:Flake8Item is an Item subclass and should not be a collector:pytest.PytestWarning
22-
2315
# shopkeep/pytest-black#67
2416
ignore:'encoding' argument not specified::pytest_black
2517

setup.cfg

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ testing =
3333
# upstream
3434
pytest >= 6
3535
pytest-checkdocs >= 2.4
36-
pytest-flake8; \
37-
# workaround for tholo/pytest-flake8#87
38-
python_version < "3.12"
39-
# workaround for tholo/pytest-flake8#87
40-
flake8 < 5
4136
pytest-black >= 0.3.7; \
4237
# workaround for jaraco/skeleton#22
4338
python_implementation != "PyPy"
@@ -46,6 +41,7 @@ testing =
4641
# workaround for jaraco/skeleton#22
4742
python_implementation != "PyPy"
4843
pytest-enabler >= 1.3
44+
pytest-ruff
4945

5046
# local
5147
importlib_resources>=1.3; python_version < "3.9"

0 commit comments

Comments
 (0)