Skip to content

[FIX] Some problems have sneaked into master #1338

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

Merged
merged 3 commits into from
Feb 1, 2016
Merged

[FIX] Some problems have sneaked into master #1338

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
463708c
fixed several errors
oesteban Jan 31, 2016
6be212e
fixed several errors
oesteban Jan 31, 2016
b73ec6d
make check-before-commit
oesteban Feb 1, 2016
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
35 changes: 0 additions & 35 deletions nipype/algorithms/tests/test_auto_ErrorMap.py
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions nipype/algorithms/tests/test_auto_Overlap.py
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions nipype/interfaces/dipy/preprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
package_check('dipy', version='0.6.0')
except Exception as e:
have_dipy = False
else:
from dipy.align.aniso2iso import resample
from dipy.core.gradients import GradientTable


class ResampleInputSpec(TraitedSpec):
Expand Down Expand Up @@ -172,6 +169,7 @@ def resample_proxy(in_file, order=3, new_zooms=None, out_file=None):
"""
Performs regridding of an image to set isotropic voxel sizes using dipy.
"""
from dipy.align.aniso2iso import resample

if out_file is None:
fname, fext = op.splitext(op.basename(in_file))
Expand Down
2 changes: 2 additions & 0 deletions nipype/interfaces/freesurfer/tests/test_auto_Surface2VolTransform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ def test_Surface2VolTransform_inputs():
usedefault=True,
),
mkmask=dict(argstr='--mkmask',
xor=['source_file'],
),
projfrac=dict(argstr='--projfrac %s',
),
Expand All @@ -26,6 +27,7 @@ def test_Surface2VolTransform_inputs():
source_file=dict(argstr='--surfval %s',
copyfile=False,
mandatory=True,
xor=['mkmask'],
),
subject_id=dict(argstr='--identity %s',
xor=['reg_file'],
Expand Down
Loading