diff --git a/.maint/update_authors.py b/.maint/update_authors.py index 66448a29d..38982575f 100644 --- a/.maint/update_authors.py +++ b/.maint/update_authors.py @@ -121,7 +121,7 @@ def get_git_lines(fname="line-contributors.txt"): if not lines and git_line_summary_path: print("Running git-line-summary on repo") lines = sp.check_output([git_line_summary_path]).decode().splitlines() - lines = [l for l in lines if "Not Committed Yet" not in l] + lines = [line for line in lines if "Not Committed Yet" not in line] contrib_file.write_text("\n".join(lines)) if not lines: diff --git a/.maint/update_zenodo.py b/.maint/update_zenodo.py index 187e95b52..bddcd516a 100755 --- a/.maint/update_zenodo.py +++ b/.maint/update_zenodo.py @@ -75,7 +75,7 @@ def get_git_lines(fname='line-contributors.txt'): if not lines and cmd[0]: print(f"Running {' '.join(cmd)!r} on repo") lines = sp.check_output(cmd).decode().splitlines() - lines = [l for l in lines if "Not Committed Yet" not in l] + lines = [line for line in lines if "Not Committed Yet" not in line] contrib_file.write_text('\n'.join(lines)) if not lines: diff --git a/docs/conf.py b/docs/conf.py index 1604b438d..9df92e803 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -24,7 +24,7 @@ sys.path.append(os.path.abspath("sphinxext")) sys.path.insert(0, os.path.abspath("../wrapper")) -from github_link import make_linkcode_resolve +from github_link import make_linkcode_resolve # noqa: E402 # -- General configuration ------------------------------------------------ diff --git a/fmriprep/interfaces/confounds.py b/fmriprep/interfaces/confounds.py index 694489e63..f3e632dbc 100644 --- a/fmriprep/interfaces/confounds.py +++ b/fmriprep/interfaces/confounds.py @@ -31,7 +31,6 @@ """ import os import re -import shutil import nibabel as nb import numpy as np @@ -39,7 +38,6 @@ from nipype import logging from nipype.interfaces.base import ( BaseInterfaceInputSpec, - Directory, File, InputMultiObject, OutputMultiObject, diff --git a/fmriprep/interfaces/gifti.py b/fmriprep/interfaces/gifti.py index 2e2ebe9e8..5c7aab6f6 100644 --- a/fmriprep/interfaces/gifti.py +++ b/fmriprep/interfaces/gifti.py @@ -7,7 +7,6 @@ import nibabel as nb import numpy as np from nipype.interfaces.base import File, SimpleInterface, TraitedSpec, isdefined, traits -from nipype.utils.filemanip import fname_presuffix class CreateROIInputSpec(TraitedSpec): diff --git a/fmriprep/workflows/bold/base.py b/fmriprep/workflows/bold/base.py index ab6cdc1ee..37080a419 100644 --- a/fmriprep/workflows/bold/base.py +++ b/fmriprep/workflows/bold/base.py @@ -192,7 +192,7 @@ def init_func_preproc_wf(bold_file, has_fieldmap=False): from niworkflows.interfaces.reportlets.registration import ( SimpleBeforeAfterRPT as SimpleBeforeAfter, ) - from niworkflows.interfaces.utility import DictMerge, KeySelect + from niworkflows.interfaces.utility import KeySelect img = nb.load(bold_file[0] if isinstance(bold_file, (list, tuple)) else bold_file) nvols = 1 if img.ndim < 4 else img.shape[3] diff --git a/fmriprep/workflows/bold/confounds.py b/fmriprep/workflows/bold/confounds.py index 14b169313..54e35bc37 100644 --- a/fmriprep/workflows/bold/confounds.py +++ b/fmriprep/workflows/bold/confounds.py @@ -27,16 +27,11 @@ .. autofunction:: init_bold_confs_wf """ -from os import getenv - from nipype.algorithms import confounds as nac -from nipype.interfaces import fsl from nipype.interfaces import utility as niu from nipype.pipeline import engine as pe from templateflow.api import get as get_template -from fmriprep import config - from ...config import DEFAULT_MEMORY_MIN_GB from ...interfaces import DerivativesDataSink from ...interfaces.confounds import ( diff --git a/fmriprep/workflows/bold/tests/test_base.py b/fmriprep/workflows/bold/tests/test_base.py index 96ecffff0..70dcd5590 100644 --- a/fmriprep/workflows/bold/tests/test_base.py +++ b/fmriprep/workflows/bold/tests/test_base.py @@ -1,7 +1,6 @@ from copy import deepcopy import bids -import pytest from niworkflows.utils.testing import generate_bids_skeleton from sdcflows.fieldmaps import clear_registry from sdcflows.utils.wrangler import find_estimators @@ -64,7 +63,7 @@ def test_get_estimator_b0field_and_intendedfor(tmp_path): generate_bids_skeleton(bids_dir, spec) layout = bids.BIDSLayout(bids_dir) - estimators = find_estimators(layout=layout, subject='01') + _ = find_estimators(layout=layout, subject='01') bold_files = sorted(layout.get(suffix='bold', extension='.nii.gz', return_type='file')) @@ -91,7 +90,7 @@ def test_get_estimator_overlapping_specs(tmp_path): generate_bids_skeleton(bids_dir, spec) layout = bids.BIDSLayout(bids_dir) - estimators = find_estimators(layout=layout, subject='01') + _ = find_estimators(layout=layout, subject='01') bold_files = sorted(layout.get(suffix='bold', extension='.nii.gz', return_type='file')) @@ -115,7 +114,7 @@ def test_get_estimator_multiple_b0fields(tmp_path): generate_bids_skeleton(bids_dir, spec) layout = bids.BIDSLayout(bids_dir) - estimators = find_estimators(layout=layout, subject='01') + _ = find_estimators(layout=layout, subject='01') bold_files = sorted(layout.get(suffix='bold', extension='.nii.gz', return_type='file'))