diff --git a/pyproject.toml b/pyproject.toml index 318b3ae5..c7a1e93c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -89,7 +89,7 @@ test-run = [ # Groups of tasks format.default_item_type = "cmd" format.sequence = [ - "isort .", + "ruff check . --select I --fix", # equivalent to "isort ." "black .", ] @@ -98,9 +98,8 @@ lint.default_item_type = "cmd" lint.sequence = [ "poetry --version", "poetry check", - "flakeheaven --version", - "flakeheaven plugins", - "flakeheaven lint", + "ruff --version", + "ruff .", ] test = [ @@ -108,11 +107,6 @@ test = [ "test-run", ] -[tool.isort] -profile = "black" -force_single_line = true -known_first_party = ["jrnl", "tests"] - [tool.pytest.ini_options] minversion = "6.0" required_plugins = [ @@ -146,6 +140,7 @@ select = [ 'E', 'F', 'W', + 'I', 'ASYNC', 'S110', # try-except-pass 'S112', # try-except-continue @@ -160,33 +155,13 @@ select = [ ] exclude = [".git", ".tox", ".venv", "node_modules"] +[tool.ruff.isort] +force-single-line = true +known-first-party = ["jrnl", "tests"] + [tool.ruff.per-file-ignores] "__init__.py" = ["F401"] # unused imports -[tool.flakeheaven] -max_line_length = 88 -exclude = [".git", ".tox", ".venv", "node_modules"] - -[tool.flakeheaven.plugins] -"py*" = ["+*"] -pycodestyle = [ - "-E101", - "-E111", "-E114", "-E115", "-E116", "-E117", - "-E12*", - "-E13*", - "-E2*", - "-E3*", - "-E401", - "-E5*", - "-E70", - "-W1*", "-W2*", "-W3*", "-W5*", -] -"flake8-*" = ["+*"] -flake8-black = ["-BLK901"] - -[tool.flakeheaven.exceptions."jrnl/journals/__init__.py"] -pyflakes = ["-F401"] - [build-system] requires = ["poetry-core>=1.0.0"] build-backend = "poetry.core.masonry.api"