Skip to content

Commit e9a5bfc

Browse files
authoredMay 4, 2024··
MNT: complete transition from flake8/black to ruff (#3279)
1 parent 3cbf147 commit e9a5bfc

File tree

4 files changed

+6
-25
lines changed

4 files changed

+6
-25
lines changed
 

‎.vscode/settings.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
{
2-
"python.linting.flake8Enabled": true,
32
"python.pythonPath": "/usr/local/miniconda/bin/python",
43
"restructuredtext.confPath": "${workspaceFolder}/docs",
54
"python.testing.pytestEnabled": true,
65
"python.testing.unittestEnabled": false,
76
"python.testing.nosetestsEnabled": false,
8-
"python.linting.enabled": true,
97
"python.testing.pytestArgs": [],
10-
"python.linting.pylintEnabled": false
8+
"editor.defaultFormatter": "charliermarsh.ruff",
119
}

‎Dockerfile_devel

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ ENV FMRIPREP_REGRESSION_SOURCE=/tmp/data/fmriprep_bold_truncated \
2626
FMRIPREP_REGRESSION_REPORTS=/tmp/data/reports \
2727
FMRIPREP_DEV=1
2828

29-
# use flake8 as linter
30-
RUN conda install -y flake8
29+
# use ruff as linter
30+
RUN conda install -y ruff
3131

3232
RUN mkdir -p /tmp/data
3333

‎pyproject.toml

+3-18
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,8 @@ doc = [
5757
"sphinx_rtd_theme>=0.5.2",
5858
]
5959
dev = [
60-
"black ~= 22.3.0",
60+
"ruff ~= 0.4.3",
6161
"pre-commit",
62-
"isort ~= 5.10.1",
63-
"flake8-pyproject",
6462
]
6563
duecredit = ["duecredit"]
6664
resmon = []
@@ -121,22 +119,9 @@ version-file = "fmriprep/_version.py"
121119
# Developer tool configurations
122120
#
123121

122+
# Disable black
124123
[tool.black]
125-
line-length = 99
126-
skip-string-normalization = true
127-
128-
[tool.isort]
129-
profile = 'black'
130-
131-
[tool.flake8]
132-
max-line-length = "99"
133-
doctests = "False"
134-
exclude = "*build/"
135-
ignore = ["W503", "E203"]
136-
per-file-ignores = [
137-
"**/__init__.py : F401",
138-
"docs/conf.py : E265",
139-
]
124+
exclude = ".*"
140125

141126
[tool.pytest.ini_options]
142127
minversion = "6"

‎wrapper/.flake8

-2
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.