Skip to content

Commit b4edde2

Browse files
authored
feat(cli): Remove CLI flags with expired deprecation periods (#3445)
Pretty straightforward. We said we'd remove these things, and now they're removed. It's been a full year and two minor versions with the deprecation warnings.
2 parents 04febd2 + 3da2842 commit b4edde2

File tree

2 files changed

+0
-57
lines changed

2 files changed

+0
-57
lines changed

fmriprep/cli/parser.py

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ def _build_parser(**kwargs):
4343

4444
deprecations = {
4545
# parser attribute name: (replacement flag, version slated to be removed in)
46-
'use_aroma': (None, '24.0.0'),
47-
'aroma_melodic_dim': (None, '24.0.0'),
48-
'aroma_err_on_warn': (None, '24.0.0'),
49-
'bold2t1w_init': ('--bold2anat-init', '24.2.0'),
50-
'bold2t1w_dof': ('--bold2anat-dof', '24.2.0'),
5146
'force_bbr': ('--force bbr', '26.0.0'),
5247
'force_no_bbr': ('--force no-bbr', '26.0.0'),
5348
'force_syn': ('--force syn-sdc', '26.0.0'),
@@ -376,19 +371,6 @@ def _slice_time_ref(value, parser):
376371
action='store_true',
377372
help='Treat dataset as longitudinal - may increase runtime',
378373
)
379-
g_conf.add_argument(
380-
'--bold2t1w-init',
381-
action=DeprecatedAction,
382-
choices=['register', 'header'],
383-
help='Deprecated - use `--bold2anat-init` instead.',
384-
)
385-
g_conf.add_argument(
386-
'--bold2t1w-dof',
387-
action=DeprecatedAction,
388-
choices=[6, 9, 12],
389-
type=int,
390-
help='Deprecated - use `--bold2anat-dof` instead.',
391-
)
392374
g_conf.add_argument(
393375
'--bold2anat-init',
394376
choices=['auto', 't1w', 't2w', 'header'],
@@ -525,32 +507,6 @@ def _slice_time_ref(value, parser):
525507
help='Disable Multimodal Surface Matching surface registration.',
526508
)
527509

528-
g_aroma = parser.add_argument_group(
529-
'[DEPRECATED] Options for running ICA_AROMA',
530-
description=(
531-
'If you would like to apply ICA-AROMA to fMRIPrep derivatives, '
532-
'please consider using fMRIPost-AROMA (https://fmripost-aroma.readthedocs.io/)'
533-
),
534-
)
535-
g_aroma.add_argument(
536-
'--use-aroma',
537-
action=DeprecatedAction,
538-
help='Deprecated. Will raise an error in 24.0.',
539-
)
540-
g_aroma.add_argument(
541-
'--aroma-melodic-dimensionality',
542-
dest='aroma_melodic_dim',
543-
action=DeprecatedAction,
544-
type=int,
545-
help='Deprecated. Will raise an error in 24.0.',
546-
)
547-
g_aroma.add_argument(
548-
'--error-on-aroma-warnings',
549-
action=DeprecatedAction,
550-
dest='aroma_err_on_warn',
551-
help='Deprecated. Will raise an error in 24.0.',
552-
)
553-
554510
g_confounds = parser.add_argument_group('Options relating to confounds')
555511
g_confounds.add_argument(
556512
'--return-all-components',

fmriprep/cli/run.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,6 @@ def main():
3939

4040
parse_args()
4141

42-
# Deprecated flags
43-
if any(
44-
(
45-
config.workflow.use_aroma,
46-
config.workflow.aroma_err_on_warn,
47-
config.workflow.aroma_melodic_dim,
48-
)
49-
):
50-
config.loggers.cli.warning(
51-
'ICA-AROMA was removed in fMRIPrep 23.1.0. The --use-aroma, --aroma-err-on-warn, '
52-
'and --aroma-melodic-dim flags will error in fMRIPrep 24.0.0.'
53-
)
54-
5542
# Code Carbon
5643
if config.execution.track_carbon:
5744
from codecarbon import OfflineEmissionsTracker

0 commit comments

Comments
 (0)