Skip to content

Commit

Permalink
MNT: complete transition from flake8/black to ruff
Browse files Browse the repository at this point in the history
  • Loading branch information
DimitriPapadopoulos committed May 4, 2024
1 parent 3cbf147 commit 858225b
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 31 deletions.
4 changes: 1 addition & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -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",
}
4 changes: 2 additions & 2 deletions Dockerfile_devel
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
21 changes: 1 addition & 20 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down Expand Up @@ -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"]
Expand Down
2 changes: 0 additions & 2 deletions wrapper/.flake8

This file was deleted.

4 changes: 0 additions & 4 deletions wrapper/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ universal = true
# Developer tool configurations
#

# Disable black
[tool.black]
exclude = ".*"

[tool.ruff]
line-length = 99

Expand Down

0 comments on commit 858225b

Please sign in to comment.