Skip to content

Commit 946f030

Browse files
committed
STY: ruff --fix smriprep [git-blame-ignore-rev]
1 parent d14bcb0 commit 946f030

File tree

19 files changed

+116
-103
lines changed

19 files changed

+116
-103
lines changed

smriprep/__about__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,4 @@
3838
]
3939
__url__ = 'https://github.com/nipreps/smriprep'
4040

41-
DOWNLOAD_URL = 'https://github.com/nipreps/{name}/archive/{ver}.tar.gz'.format(
42-
name=__package__, ver=__version__
43-
)
41+
DOWNLOAD_URL = f'https://github.com/nipreps/{__package__}/archive/{__version__}.tar.gz'

smriprep/cli/run.py

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,15 @@ def check_deps(workflow):
4343

4444
def get_parser():
4545
"""Build parser object."""
46+
from argparse import ArgumentParser, RawTextHelpFormatter
4647
from pathlib import Path
47-
from argparse import ArgumentParser
48-
from argparse import RawTextHelpFormatter
48+
4949
from niworkflows.utils.spaces import (
50+
OutputReferencesAction,
5051
Reference,
5152
SpatialReferences,
52-
OutputReferencesAction,
5353
)
54+
5455
from ..__about__ import __version__
5556

5657
parser = ArgumentParser(
@@ -318,13 +319,14 @@ def get_parser():
318319

319320
def build_opts(opts):
320321
"""Trigger a new process that builds the workflow graph, based on the input options."""
321-
import os
322-
from pathlib import Path
322+
import gc
323323
import logging
324+
import os
324325
import sys
325-
import gc
326326
import warnings
327-
from multiprocessing import set_start_method, Process, Manager
327+
from multiprocessing import Manager, Process, set_start_method
328+
from pathlib import Path
329+
328330
from nipype import logging as nlogging
329331
from niworkflows.utils.misc import check_valid_fs_license
330332

@@ -409,16 +411,17 @@ def _warn_redirect(message, category, filename, lineno, file=None, line=None):
409411
errno = 1
410412
else:
411413
if opts.run_reconall:
412-
from templateflow import api
413414
from niworkflows.utils.misc import _copy_any
415+
from templateflow import api
414416

415417
dseg_tsv = str(api.get('fsaverage', suffix='dseg', extension=['.tsv']))
416418
_copy_any(dseg_tsv, str(Path(output_dir) / 'smriprep' / 'desc-aseg_dseg.tsv'))
417419
_copy_any(dseg_tsv, str(Path(output_dir) / 'smriprep' / 'desc-aparcaseg_dseg.tsv'))
418420
logger.log(25, 'sMRIPrep finished without errors')
419421
finally:
420422
from niworkflows.reports import generate_reports
421-
from ..utils.bids import write_derivative_description, write_bidsignore
423+
424+
from ..utils.bids import write_bidsignore, write_derivative_description
422425

423426
logger.log(25, 'Writing reports for participants: %s', ', '.join(subject_list))
424427
# Generate reports phase
@@ -439,17 +442,19 @@ def build_workflow(opts, retval):
439442
a hard-limited memory-scope.
440443
441444
"""
442-
from shutil import copyfile
443-
from os import cpu_count
445+
import json
444446
import uuid
445447
import warnings
448+
from os import cpu_count
449+
from shutil import copyfile
450+
from subprocess import CalledProcessError, TimeoutExpired, check_call
446451
from time import strftime
447-
from subprocess import check_call, CalledProcessError, TimeoutExpired
448452

449-
import json
450453
from bids import BIDSLayout
451-
from nipype import logging, config as ncfg
454+
from nipype import config as ncfg
455+
from nipype import logging
452456
from niworkflows.utils.bids import collect_participants
457+
453458
from ..__about__ import __version__
454459
from ..data import load_resource
455460
from ..workflows.base import init_smriprep_wf

smriprep/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22

3-
import pytest
43
import numpy
4+
import pytest
55

66
from smriprep.data import load_resource
77

smriprep/data/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
from functools import lru_cache as cache
99

1010
try: # Prefer backport to leave consistency to dependency spec
11-
from importlib_resources import files, as_file
11+
from importlib_resources import as_file, files
1212
except ImportError:
13-
from importlib.resources import files, as_file
13+
from importlib.resources import as_file, files
1414

1515
__all__ = ['load_resource']
1616

smriprep/interfaces/cifti.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import json
2-
from pathlib import Path
32
import typing as ty
3+
from pathlib import Path
44

55
import nibabel as nb
66
import numpy as np
7-
87
from nibabel import cifti2 as ci
9-
from nipype.interfaces.base import TraitedSpec, traits, File, SimpleInterface
8+
from nipype.interfaces.base import File, SimpleInterface, TraitedSpec, traits
109
from templateflow import api as tf
1110

1211

@@ -52,7 +51,7 @@ def _run_interface(self, runtime):
5251
return runtime
5352

5453

55-
def _prepare_cifti(grayordinates: str) -> ty.Tuple[list, dict]:
54+
def _prepare_cifti(grayordinates: str) -> tuple[list, dict]:
5655
"""
5756
Fetch the required templates needed for CIFTI-2 generation, based on input surface density.
5857
@@ -133,8 +132,8 @@ def _prepare_cifti(grayordinates: str) -> ty.Tuple[list, dict]:
133132

134133

135134
def _create_cifti_image(
136-
scalar_surfs: ty.Tuple[str, str],
137-
surface_labels: ty.Tuple[str, str],
135+
scalar_surfs: tuple[str, str],
136+
surface_labels: tuple[str, str],
138137
scalar_name: str,
139138
metadata: ty.Optional[dict] = None,
140139
):

smriprep/interfaces/freesurfer.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@
2222
#
2323
"""Nipype's recon-all replacement."""
2424
import os
25+
2526
from looseversion import LooseVersion
2627
from nipype import logging
27-
from nipype.utils.filemanip import check_depends
28-
from nipype.interfaces.base import traits, InputMultiObject, isdefined, File
2928
from nipype.interfaces import freesurfer as fs
29+
from nipype.interfaces.base import File, InputMultiObject, isdefined, traits
30+
from nipype.utils.filemanip import check_depends
3031
from niworkflows.interfaces import freesurfer as nwfs
3132

3233
iflogger = logging.getLogger('nipype.interface')

smriprep/interfaces/reports.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,24 @@
2222
#
2323
"""Interfaces to generate reportlets."""
2424

25-
from pathlib import Path
2625
import time
26+
from pathlib import Path
2727

28+
from nipype.interfaces import freesurfer as fs
2829
from nipype.interfaces.base import (
29-
TraitedSpec,
3030
BaseInterfaceInputSpec,
31-
File,
3231
Directory,
32+
File,
3333
InputMultiObject,
34+
SimpleInterface,
3435
Str,
36+
TraitedSpec,
3537
isdefined,
36-
SimpleInterface,
3738
)
38-
from nipype.interfaces import freesurfer as fs
3939
from nipype.interfaces.io import FSSourceInputSpec as _FSSourceInputSpec
4040
from nipype.interfaces.mixins import reporting
41-
4241
from niworkflows.interfaces.reportlets.base import _SVGReportCapableInputSpec
4342

44-
4543
SUBJECT_TEMPLATE = """\
4644
\t<ul class="elem-desc">
4745
\t\t<li>Subject ID: {subject_id}</li>
@@ -173,12 +171,12 @@ class FSSurfaceReport(SimpleInterface):
173171
output_spec = _FSSurfaceReportOutputSpec
174172

175173
def _run_interface(self, runtime):
174+
from nibabel import load
176175
from niworkflows.viz.utils import (
177-
plot_registration,
178-
cuts_from_bbox,
179176
compose_view,
177+
cuts_from_bbox,
178+
plot_registration,
180179
)
181-
from nibabel import load
182180

183181
rootdir = Path(self.inputs.subjects_dir) / self.inputs.subject_id
184182
_anat_file = str(rootdir / 'mri' / 'brain.mgz')

smriprep/interfaces/surf.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,16 @@
2525
from pathlib import Path
2626
from typing import Optional
2727

28-
import numpy as np
2928
import nibabel as nb
3029
import nitransforms as nt
31-
30+
import numpy as np
3231
from nipype.interfaces.base import (
3332
BaseInterfaceInputSpec,
34-
TraitedSpec,
35-
SimpleInterface,
3633
File,
37-
isdefined,
3834
InputMultiObject,
35+
SimpleInterface,
36+
TraitedSpec,
37+
isdefined,
3938
traits,
4039
)
4140

@@ -140,9 +139,9 @@ class AggregateSurfaces(SimpleInterface):
140139
output_spec = AggregateSurfacesOutputSpec
141140

142141
def _run_interface(self, runtime):
143-
from collections import defaultdict
144142
import os
145143
import re
144+
from collections import defaultdict
146145

147146
container = defaultdict(list)
148147
inputs = (self.inputs.surfaces or []) + (self.inputs.morphometrics or [])

smriprep/interfaces/templateflow.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,17 @@
2222
#
2323
"""Interfaces to get templates from TemplateFlow."""
2424
import logging
25-
from templateflow import api as tf
25+
2626
from nipype.interfaces.base import (
27-
SimpleInterface,
2827
BaseInterfaceInputSpec,
28+
File,
29+
InputMultiObject,
30+
SimpleInterface,
2931
TraitedSpec,
3032
isdefined,
3133
traits,
32-
File,
33-
InputMultiObject,
3434
)
35+
from templateflow import api as tf
3536

3637
LOGGER = logging.getLogger('nipype.interface')
3738

smriprep/interfaces/tests/test_surf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
import nibabel as nb
2-
from nipype.pipeline import engine as pe
32
import numpy as np
3+
from nipype.pipeline import engine as pe
44

55
from ...data import load_resource
66
from ..surf import MakeRibbon
77

88

99
def test_MakeRibbon(tmp_path):
1010
res_template = '{path}/sub-fsaverage_res-4_hemi-{hemi}_desc-cropped_{surf}dist.nii.gz'
11-
white, pial = [
11+
white, pial = (
1212
[
1313
load_resource(
1414
res_template.format(path='../interfaces/tests/data', hemi=hemi, surf=surf)
1515
)
1616
for hemi in 'LR'
1717
]
1818
for surf in ('wm', 'pial')
19-
]
19+
)
2020

2121
make_ribbon = pe.Node(
2222
MakeRibbon(white_distvols=white, pial_distvols=pial),

0 commit comments

Comments
 (0)