Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MNT: complete transition from flake8/black to ruff #3279

Merged
merged 2 commits into from
May 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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: 3 additions & 18 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,22 +119,9 @@ version-file = "fmriprep/_version.py"
# Developer tool configurations
#

# Disable black
[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",
]
exclude = ".*"

[tool.pytest.ini_options]
minversion = "6"
Expand Down
2 changes: 0 additions & 2 deletions wrapper/.flake8

This file was deleted.