Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: remove flag from normalize #1048

Merged
merged 3 commits into from
Feb 10, 2015
Merged

fix: remove flag from normalize #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01e8e70
fix: remove flag from normalize
satra Feb 10, 2015
86a9249
fix: remove mandatory flag
satra Feb 10, 2015
b7964c4
fix: resolve conflict
satra Feb 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Next release
============

* FIX: remove unused mandatory flag from spm normalize (https://github.com/nipy/nipype/pull/1048)
* ENH: Update ANTSCorticalThickness interface (https://github.com/nipy/nipype/pull/1013)
* FIX: Edge case with sparsemodels and PEP8 cleanup (https://github.com/nipy/nipype/pull/1046)
* ENH: New io interfaces for JSON files reading/writing (https://github.com/nipy/nipype/pull/1020)
Expand Down
2 changes: 1 addition & 1 deletion nipype/interfaces/spm/preprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ class Normalize12InputSpec(SPMCommandInputSpec):
desc='FWHM of Gaussian smoothness of bias')
tpm = File(exists=True, field='eoptions.tpm',
desc='template in form of tissue probablitiy maps to normalize to',
mandatory=False, xor=['deformation_file'],
xor=['deformation_file'],
copyfile=False)
affine_regularization_type = traits.Enum('mni', 'size', 'none',
field='eoptions.affreg',
Expand Down
1 change: 0 additions & 1 deletion nipype/interfaces/spm/tests/test_auto_Normalize12.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ def test_Normalize12_inputs():
),
tpm=dict(copyfile=False,
field='eoptions.tpm',
mandatory=False,
xor=['deformation_file'],
),
use_mcr=dict(),
Expand Down