From feeec8f90224a975a16ba99c2c13f8dbc13300f6 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Thu, 29 Feb 2024 22:26:10 +0100 Subject: [PATCH] MNT: Add flake8-logging-format (G) rules to ruff --- fmriprep/_warnings.py | 4 ++-- fmriprep/interfaces/reports.py | 5 +++-- fmriprep/workflows/bold/stc.py | 2 +- pyproject.toml | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/fmriprep/_warnings.py b/fmriprep/_warnings.py index 9b8cdac97..41f2a7d66 100644 --- a/fmriprep/_warnings.py +++ b/fmriprep/_warnings.py @@ -36,9 +36,9 @@ def _warn(message, category=None, stacklevel=1, source=None, **kwargs): category = category.replace('type', 'WARNING') if kwargs: - logging.getLogger('py.warnings').warning(f'Extra warning kwargs: {kwargs}') + logging.getLogger('py.warnings').warning('Extra warning kwargs: %s', kwargs) - logging.getLogger('py.warnings').warning(f'{category or "WARNING"}: {message}') + logging.getLogger('py.warnings').warning('%s: %s', category or 'WARNING', message) def _showwarning(message, category, filename, lineno, file=None, line=None, **kwargs): diff --git a/fmriprep/interfaces/reports.py b/fmriprep/interfaces/reports.py index 49ac59054..4c03a107a 100644 --- a/fmriprep/interfaces/reports.py +++ b/fmriprep/interfaces/reports.py @@ -372,7 +372,8 @@ def get_world_pedir(ornt, pe_direction): if flip[not inv].startswith(axcode): return '-'.join(flip) LOGGER.warning( - 'Cannot determine world direction of phase encoding. ' - f'Orientation: {ornt}; PE dir: {pe_direction}' + 'Cannot determine world direction of phase encoding. Orientation: %s; PE dir: %s', + ornt, + pe_direction, ) return 'Could not be determined - assuming Anterior-Posterior' diff --git a/fmriprep/workflows/bold/stc.py b/fmriprep/workflows/bold/stc.py index 65e9e6fe9..bae48f704 100644 --- a/fmriprep/workflows/bold/stc.py +++ b/fmriprep/workflows/bold/stc.py @@ -115,7 +115,7 @@ def init_bold_stc_wf( inputnode = pe.Node(niu.IdentityInterface(fields=['bold_file', 'skip_vols']), name='inputnode') outputnode = pe.Node(niu.IdentityInterface(fields=['stc_file']), name='outputnode') - LOGGER.log(25, f'BOLD series will be slice-timing corrected to an offset of {tzero:.3g}s.') + LOGGER.log(25, 'BOLD series will be slice-timing corrected to an offset of %.3gs.', tzero) # It would be good to fingerprint memory use of afni.TShift slice_timing_correction = pe.Node( diff --git a/pyproject.toml b/pyproject.toml index 7a05d2f3d..c666c7278 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -171,6 +171,7 @@ extend-select = [ # "EM", "EXE", "FA", + "G", "ISC", "ICN", "PT",