gifn-apply: rename the Ruff config files for clarity
Put the Ruff TOML configuration files into the same directory;
they do not necessarily need to be named pyproject.toml for
some time now, so there is no need to keep them in separate directories.
Change-Id: I14f89b219716f7e796d085fc2bcd98a0ff661e22
diff --git a/tools/git-if-needed/python/config/ruff-all/pyproject.toml b/tools/git-if-needed/python/config/ruff/all.toml
similarity index 63%
rename from tools/git-if-needed/python/config/ruff-all/pyproject.toml
rename to tools/git-if-needed/python/config/ruff/all.toml
index 280a424..2e384a0 100644
--- a/tools/git-if-needed/python/config/ruff-all/pyproject.toml
+++ b/tools/git-if-needed/python/config/ruff/all.toml
@@ -1,8 +1,7 @@
# SPDX-FileCopyrightText: StorPool <support@storpool.com>
# SPDX-License-Identifier: BSD-2-Clause
-[tool.ruff]
-extend = "../ruff-base/pyproject.toml"
+extend = "base.toml"
-[tool.ruff.lint]
+[lint]
select = ["ALL"]
diff --git a/tools/git-if-needed/python/config/ruff-base/pyproject.toml b/tools/git-if-needed/python/config/ruff/base.toml
similarity index 82%
rename from tools/git-if-needed/python/config/ruff-base/pyproject.toml
rename to tools/git-if-needed/python/config/ruff/base.toml
index 3a363c0..e7d7d06 100644
--- a/tools/git-if-needed/python/config/ruff-base/pyproject.toml
+++ b/tools/git-if-needed/python/config/ruff/base.toml
@@ -1,12 +1,11 @@
# SPDX-FileCopyrightText: StorPool <support@storpool.com>
# SPDX-License-Identifier: BSD-2-Clause
-[tool.ruff]
target-version = "py38"
line-length = 100
preview = true
-[tool.ruff.lint]
+[lint]
select = []
ignore = [
# This is our style
@@ -23,15 +22,15 @@
"TRY003",
]
-[tool.ruff.lint.flake8-copyright]
+[lint.flake8-copyright]
notice-rgx = "(?x) SPDX-FileCopyrightText: \\s \\S"
-[tool.ruff.lint.isort]
+[lint.isort]
force-single-line = true
known-first-party = ["gifn_apply"]
lines-after-imports = 2
single-line-exclusions = ["typing"]
-[tool.ruff.lint.per-file-ignores]
+[lint.per-file-ignores]
# This is a test suite
"tests/unit/*" = ["S101"]
diff --git a/tools/git-if-needed/python/tox.ini b/tools/git-if-needed/python/tox.ini
index a17f44c..cbcb90a 100644
--- a/tools/git-if-needed/python/tox.ini
+++ b/tools/git-if-needed/python/tox.ini
@@ -24,8 +24,8 @@
deps =
-r requirements/ruff.txt
commands =
- ruff check --config config/ruff-base/pyproject.toml --select=D,I --diff -- {[defs]pyfiles}
- ruff format --check --config config/ruff-base/pyproject.toml --diff -- {[defs]pyfiles}
+ ruff check --config config/ruff/base.toml --select=D,I --diff -- {[defs]pyfiles}
+ ruff format --check --config config/ruff/base.toml --diff -- {[defs]pyfiles}
[testenv:reformat]
skip_install = True
@@ -35,8 +35,8 @@
deps =
-r requirements/ruff.txt
commands =
- ruff check --config config/ruff-base/pyproject.toml --select=D,I --fix -- {[defs]pyfiles}
- ruff format --config config/ruff-base/pyproject.toml -- {[defs]pyfiles}
+ ruff check --config config/ruff/base.toml --select=D,I --fix -- {[defs]pyfiles}
+ ruff format --config config/ruff/base.toml -- {[defs]pyfiles}
[testenv:mypy]
skip_install = True
@@ -56,7 +56,7 @@
deps =
-r requirements/ruff.txt
commands =
- ruff check --config config/ruff-all/pyproject.toml -- {[defs]pyfiles}
+ ruff check --config config/ruff/all.toml -- {[defs]pyfiles}
[testenv:unit-tests]
tags =