diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 17a4be72c7751dd97b7f564e27e3a23b9a9b46a5..5744837332d3687573603da43d0fe67e7878e541 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,7 +3,7 @@ order. -3.6.1 (Thursday 27th April 2021) +3.6.2 (Wednesday 23rd June 2021) -------------------------------- @@ -11,6 +11,18 @@ Changed ^^^^^^^ +* The ``fsl.wrappers.fast`` wrapper passes ``-v`` to ``fast`` if ``v=True`` or + ``verbose=True`` is specified. + + +3.6.1 (Thursday 27th May 2021) +------------------------------ + + +Changed +^^^^^^^ + + * Removed the ``dataclasses`` backport from requirements (!297). diff --git a/fsl/wrappers/fast.py b/fsl/wrappers/fast.py index c51c9f245ad153018d1a76a81dd2d743f3b437c5..9686b4043127e510af2d7d1d66d71bac19dc9801 100644 --- a/fsl/wrappers/fast.py +++ b/fsl/wrappers/fast.py @@ -50,7 +50,7 @@ def fast(imgs, out='fast', **kwargs): 'n_classes' : 'class', } - cmd = ['fast', '-v', '--out=%s' % out] + cmd = ['fast', '--out=%s' % out] cmd += wutils.applyArgStyle('--=', valmap=valmap, argmap=argmap, diff --git a/tests/test_wrappers/test_wrappers.py b/tests/test_wrappers/test_wrappers.py index e93d494eaffd46221e6efabc4d5dcb18062b69c8..d914d3671ed62c00d5c0d177966090057ae2877e 100644 --- a/tests/test_wrappers/test_wrappers.py +++ b/tests/test_wrappers/test_wrappers.py @@ -327,13 +327,16 @@ def test_fast(): cmd = op.join(fsldir, 'bin', 'fast') result = fw.fast('input', 'myseg', n_classes=3) - expected = [cmd, '-v', '--out=myseg', '--class=3', 'input'] + expected = [cmd, '--out=myseg', '--class=3', 'input'] assert result.stdout[0] == ' '.join(expected) result = fw.fast(('in1', 'in2', 'in3'), 'myseg', n_classes=3) - expected = [cmd, '-v', '--out=myseg', '--class=3', 'in1', 'in2', 'in3'] + expected = [cmd, '--out=myseg', '--class=3', 'in1', 'in2', 'in3'] + assert result.stdout[0] == ' '.join(expected) + result = fw.fast(('in1', 'in2', 'in3'), 'myseg', n_classes=3, verbose=True) + expected = [cmd, '--out=myseg', '--class=3', '--verbose', 'in1', 'in2', 'in3'] assert result.stdout[0] == ' '.join(expected) @@ -390,10 +393,10 @@ def test_tbss(): def test_fsl_prepare_fieldmap(): with asrt.disabled(), run.dryrun(), mockFSLDIR(bin=('fsl_prepare_fieldmap',)) as fsldir: fpf = op.join(fsldir, 'bin', 'fsl_prepare_fieldmap') - result = fw.fsl_prepare_fieldmap(phase_image='ph', - magnitude_image='mag', - out_image='out', - deltaTE=2.46, - nocheck=True) + result = fw.fsl_prepare_fieldmap(phase_image='ph', + magnitude_image='mag', + out_image='out', + deltaTE=2.46, + nocheck=True) expected = (fpf, ('SIEMENS', 'ph', 'mag', 'out', '2.46', '--nocheck')) assert checkResult(result.stdout[0], *expected)