Skip to content

Replace non-custom flake8 linting with ruff #21037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
huonw wants to merge 4 commits into from
+40 −124
Closed

Replace non-custom flake8 linting with ruff #21037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a1574b
Enable ruff
huonw Jun 6, 2024
5b2a569
Move move built-in linters from flake8 to ruff
huonw Jun 6, 2024
f330f2e
Move flake8-2020, flake8-comprehensions
huonw Jun 6, 2024
9c270a3
flake8-no-implicit-concat -> ruff (flake8-implicit-str-concat)
huonw Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions 3rdparty/python/flake8-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
flake8>=5.0.4,<7
flake8-2020>=1.7.0,<2
flake8-no-implicit-concat
flake8-comprehensions>=3.10.0,<4.0
103 changes: 0 additions & 103 deletions 3rdparty/python/flake8.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
// "CPython==3.9.*"
// ],
// "generated_with_requirements": [
// "flake8-2020<2,>=1.7.0",
// "flake8-comprehensions<4.0,>=3.10.0",
// "flake8-no-implicit-concat",
// "flake8<7,>=5.0.4"
// ],
// "manylinux": "manylinux2014",
Expand Down Expand Up @@ -52,85 +49,6 @@
"requires_python": ">=3.8.1",
"version": "6.0.0"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "1553b2b3638135b276f7a3252301e81376901e7b6a5eaccb07a969771f178375",
"url": "https://files.pythonhosted.org/packages/a5/6e/df5766df36c1280d0b96996e89e160cab2f1fa4ffd7434ff252c51025ca7/flake8_2020-1.8.0-py2.py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "f5312b3634266bd0f1957f64ecabeb62d67bbd9cee637e33a2651a80091f90aa",
"url": "https://files.pythonhosted.org/packages/3d/0e/29c1a6d15baa70865daa1ae6887742d5907fb75b92c4c1a8281915f8550d/flake8_2020-1.8.0.tar.gz"
}
],
"project_name": "flake8-2020",
"requires_dists": [
"flake8>=5"
],
"requires_python": ">=3.8",
"version": "1.8.0"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "013234637ec7dfcb7cd2900578fb53c512f81db909cefe371c019232695c362d",
"url": "https://files.pythonhosted.org/packages/9b/8d/b70f791311a8c6975c0c6634dd44db8fd712d6ad9ed6a3fe888b9be7c89b/flake8_comprehensions-3.12.0-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "419ef1a6e8de929203791a5e8ff5e3906caeba13eb3290eebdbf88a9078d502e",
"url": "https://files.pythonhosted.org/packages/65/b4/9a2cbbac095aaf1e8dbe3eac55a5155cb9f7860fbb0d9fa23443b5a3afd1/flake8_comprehensions-3.12.0.tar.gz"
}
],
"project_name": "flake8-comprehensions",
"requires_dists": [
"flake8!=3.2.0,>=3.0",
"importlib-metadata; python_version < \"3.8\""
],
"requires_python": ">=3.7",
"version": "3.12.0"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "5c056e06f22820865cb34962a1da80767fed5273920b0768e97739021d428de5",
"url": "https://files.pythonhosted.org/packages/87/04/983ec9268488911103bc3b30bcdef3936cb9ed55a53d8ad25f023e76243a/flake8_no_implicit_concat-0.3.4-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "1b522becd7568ee2e288bc58e294ebd0d771996ee3138a5322a3cefb21c8464b",
"url": "https://files.pythonhosted.org/packages/00/f2/f7616a05059683e4e3970c21f7ed820b18eca08ab272e774dc5ed07aa9c6/flake8-no-implicit-concat-0.3.4.tar.gz"
}
],
"project_name": "flake8-no-implicit-concat",
"requires_dists": [
"black; extra == \"dev\"",
"codecov; extra == \"dev\"",
"coverage; extra == \"dev\"",
"darglint; extra == \"dev\"",
"flake8",
"flake8-2020; extra == \"dev\"",
"flake8-black; extra == \"dev\"",
"flake8-broken-line; extra == \"dev\"",
"flake8-builtins; extra == \"dev\"",
"flake8-docstrings; extra == \"dev\"",
"flake8-isort; extra == \"dev\"",
"flake8-rst-docstrings; extra == \"dev\"",
"flake8; extra == \"dev\"",
"hacking>=4; extra == \"dev\"",
"isort; extra == \"dev\"",
"more-itertools; python_version < \"3.10\"",
"mypy; extra == \"dev\"",
"pep8-naming; extra == \"dev\"",
"typing; python_version < \"3.5\""
],
"requires_python": ">=3.3",
"version": "0.3.4"
},
{
"artifacts": [
{
Expand All @@ -149,24 +67,6 @@
"requires_python": ">=3.6",
"version": "0.7.0"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "d2bc7f02446e86a68911e58ded76d6561eea00cddfb2a91e7019bbb586c799f3",
"url": "https://files.pythonhosted.org/packages/85/01/e2678ee4e0d7eed4fd6be9e5b043fff9d22d245d06c8c91def8ced664189/more_itertools-9.1.0-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "cabaa341ad0389ea83c17a94566a53ae4c9d07349861ecb14dc6d0345cf9ac5d",
"url": "https://files.pythonhosted.org/packages/2e/d0/bea165535891bd1dcb5152263603e902c0ec1f4c9a2e152cc4adff6b3a38/more-itertools-9.1.0.tar.gz"
}
],
"project_name": "more-itertools",
"requires_dists": [],
"requires_python": ">=3.7",
"version": "9.1.0"
},
{
"artifacts": [
{
Expand Down Expand Up @@ -212,9 +112,6 @@
"pip_version": "23.1.2",
"prefer_older_binary": false,
"requirements": [
"flake8-2020<2,>=1.7.0",
"flake8-comprehensions<4.0,>=3.10.0",
"flake8-no-implicit-concat",
"flake8<7,>=5.0.4"
],
"requires_python": [
Expand Down
23 changes: 5 additions & 18 deletions build-support/flake8/.flake8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,10 @@
[flake8]
extend-ignore:
# whitespace before ':' (conflicts with Black)
E203,
# Bad trailing comma (conflicts with Black)
E231,
# line too long (> 79 characters)
E501,
# Do not assign a lambda expression
E731,
# Ambiguous variable name (enable once fixed)
E741,
# line break before binary operator (conflicts with Black)
W503,
# Implicitly concatenated string literals over multiple lines
NIC002,
# Implicitly concatenated bytes literals over multiple lines
NIC102,
# Unnecessary dict call - rewrite as a literal
C408,
# Defaults are all handled by ruff:
F,
E,
W,
C90,

[flake8:local-plugins]
extension =
Expand Down
1 change: 1 addition & 0 deletions pants.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ backend_packages.add = [
"pants.backend.python.lint.docformatter",
"pants.backend.python.lint.flake8",
"pants.backend.python.lint.isort",
"pants.backend.experimental.python.lint.ruff.check",
"pants.backend.python.typecheck.mypy",
"pants.backend.python.lint.pyupgrade",
"pants.backend.python.mixed_interpreter_constraints",
Expand Down
34 changes: 34 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,37 @@ module = [
"psutil",
]
ignore_missing_imports = true

[tool.ruff]
target-version = "py39"
# same as black
line-length = 100

[tool.ruff.lint]
select = [
# flake8 defaults:
"F",
"E",
"W",
# flake8-comprehensions
"C4",
# flake8-2020
"YTT",
# flake8-implicit-str-concat, but only on a single line (includes bytes)
"ISC001",
Copy link
Copy Markdown
Contributor

@lilatomic lilatomic Jun 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we also need to add ISC002 to match NIC002 ? If it includes bytes too, I only found one instance of that (in a test), so it might be easier to fix it there

]

ignore = [
# whitespace before ':' (conflicts with Black)
"E203",
# Bad trailing comma (conflicts with Black)
"E231",
# line too long (> 79 characters)
"E501",
# Do not assign a lambda expression
"E731",
# Ambiguous variable name (enable once fixed)
"E741",
# Unnecessary dict call - rewrite as a literal
"C408",
]