diff --git a/Makefile b/Makefile index 6472535..ce52ca5 100644 --- a/Makefile +++ b/Makefile @@ -12,11 +12,11 @@ tests: .PHONY: reformat reformat: ruff format . - ruff --fix . + ruff check . --fix .PHONY: lint lint: - ruff . + ruff check . .PHONY: docs docs: clean diff --git a/pyproject.toml b/pyproject.toml index 97f3c24..ccd1156 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,6 +44,11 @@ Source = "https://github.com/zostera/django-icons" [tool.ruff] fix = false +line-length = 120 +src = ["src"] +target-version = "py38" + +[tool.ruff.lint] fixable = [ "I001", # isort (sorting) "F", # flake8 @@ -56,7 +61,6 @@ ignore = [ "D212", # D212: Multi-line docstring summary should start at the first line "D301", # D301: Use r”“” if any backslashes in a docstring (unclear how else to handle backslashes in docstrings) ] -line-length = 120 select = [ "D", # pydocstyle "E", # pycodestyle @@ -64,13 +68,11 @@ select = [ "I", # isort "UP", # pyupgrade ] -src = ["src"] -target-version = "py38" unfixable = [ "F8", # names in flake8, such as defined but unused variables ] -[tool.ruff.isort] +[tool.ruff.lint.isort] known-first-party = ["django_marina", "app"] known-third-party = ["django"] diff --git a/requirements-test.txt b/requirements-test.txt index 0e18415..43a8683 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,3 +1,3 @@ tox==4.14.2 coverage==7.4.4 -ruff==0.3.7 +ruff==0.4.1