diff --git a/.vscode/settings.json b/.vscode/settings.json index 0282058e1..6027653f5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,11 +1,9 @@ { - "python.linting.flake8Enabled": true, "python.pythonPath": "/usr/local/miniconda/bin/python", "restructuredtext.confPath": "${workspaceFolder}/docs", "python.testing.pytestEnabled": true, "python.testing.unittestEnabled": false, "python.testing.nosetestsEnabled": false, - "python.linting.enabled": true, "python.testing.pytestArgs": [], - "python.linting.pylintEnabled": false + "editor.defaultFormatter": "charliermarsh.ruff", } diff --git a/Dockerfile_devel b/Dockerfile_devel index da320649c..0c05a6d59 100644 --- a/Dockerfile_devel +++ b/Dockerfile_devel @@ -26,8 +26,8 @@ ENV FMRIPREP_REGRESSION_SOURCE=/tmp/data/fmriprep_bold_truncated \ FMRIPREP_REGRESSION_REPORTS=/tmp/data/reports \ FMRIPREP_DEV=1 -# use flake8 as linter -RUN conda install -y flake8 +# use ruff as linter +RUN conda install -y ruff RUN mkdir -p /tmp/data diff --git a/pyproject.toml b/pyproject.toml index 2273274bb..097439881 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,10 +57,8 @@ doc = [ "sphinx_rtd_theme>=0.5.2", ] dev = [ - "black ~= 22.3.0", + "ruff ~= 0.4.3", "pre-commit", - "isort ~= 5.10.1", - "flake8-pyproject", ] duecredit = ["duecredit"] resmon = [] @@ -121,23 +119,6 @@ version-file = "fmriprep/_version.py" # Developer tool configurations # -[tool.black] -line-length = 99 -skip-string-normalization = true - -[tool.isort] -profile = 'black' - -[tool.flake8] -max-line-length = "99" -doctests = "False" -exclude = "*build/" -ignore = ["W503", "E203"] -per-file-ignores = [ - "**/__init__.py : F401", - "docs/conf.py : E265", -] - [tool.pytest.ini_options] minversion = "6" testpaths = ["fmriprep/tests"] diff --git a/wrapper/.flake8 b/wrapper/.flake8 deleted file mode 100644 index 61d908155..000000000 --- a/wrapper/.flake8 +++ /dev/null @@ -1,2 +0,0 @@ -[flake8] -max-line-length = 99 diff --git a/wrapper/pyproject.toml b/wrapper/pyproject.toml index 6954d8a87..e7119072a 100644 --- a/wrapper/pyproject.toml +++ b/wrapper/pyproject.toml @@ -63,10 +63,6 @@ universal = true # Developer tool configurations # -# Disable black -[tool.black] -exclude = ".*" - [tool.ruff] line-length = 99