Skip to content

Commit ecfd1ce

Browse files
authored
Merge pull request #4238 from Avasam/Flake8-2020-to-Ruff
Replace Flake8-2020 by Ruff
2 parents 80da90c + 3d7e0bf commit ecfd1ce

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

newsfragments/4238.misc.rst

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Drop dependency on Flake8 by using Ruff's YTT rules instead of flake8-2020 -- by :user:`Avasam`

ruff.toml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ ignore = [
1818
]
1919
extend-select = [
2020
"UP", # pyupgrade
21+
"YTT", # flake8-2020
2122
]
2223
extend-ignore = [
2324
"UP015", # redundant-open-modes, explicit is preferred

setup.cfg

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ testing =
5555
pytest-ruff >= 0.2.1; sys_platform != "cygwin"
5656

5757
# local
58-
flake8-2020
5958
virtualenv>=13.0.0
6059
wheel
6160
pip>=19.1 # For proper file:// URLs support.

setuptools/tests/test_core_metadata.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,9 @@ def test_parity_with_metadata_from_pypa_wheel(tmp_path):
323323
"testing": """
324324
pytest >= 6
325325
pytest-checkdocs >= 2.4
326-
pytest-flake8 ; \\
327-
# workaround for tholo/pytest-flake8#87
328-
python_version < "3.12"
326+
tomli ; \\
327+
# Using stdlib when possible
328+
python_version < "3.11"
329329
ini2toml[lite]>=0.9
330330
""",
331331
"other": [],
@@ -345,7 +345,7 @@ def test_parity_with_metadata_from_pypa_wheel(tmp_path):
345345
'Requires-Python: >=3.8',
346346
'Provides-Extra: other',
347347
'Provides-Extra: testing',
348-
'Requires-Dist: pytest-flake8; python_version < "3.12" and extra == "testing"',
348+
'Requires-Dist: tomli; python_version < "3.11" and extra == "testing"',
349349
'Requires-Dist: more-itertools==8.8.0; extra == "other"',
350350
'Requires-Dist: ini2toml[lite]>=0.9; extra == "testing"',
351351
]

0 commit comments

Comments
 (0)