Skip to content

Commit d5730c7

Browse files
committed
[FIX] Minor errors after migration to setuptools
Fixes #1670
1 parent dbd53b2 commit d5730c7

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

nipype/info.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def get_nipype_gitversion():
156156
]
157157

158158
EXTRA_REQUIRES = {
159-
'doc': ['Sphinx>=0.3', 'matplotlib', 'pydotplus'],
159+
'doc': ['Sphinx>=0.3', 'matplotlib', 'pydotplus', 'doctest-ignore-unicode'],
160160
'tests': TESTS_REQUIRES,
161161
'fmri': ['nitime', 'nilearn', 'dipy', 'nipy', 'matplotlib'],
162162
'profiler': ['psutil'],

nipype/interfaces/utility.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
Undefined, isdefined, OutputMultiPath, runtime_profile,
2626
InputMultiPath, BaseInterface, BaseInterfaceInputSpec)
2727
from .io import IOBase, add_traits
28-
from ..testing import assert_equal
2928
from ..utils.filemanip import (filename_to_list, copyfile, split_filename)
3029
from ..utils.misc import getsource, create_function_from_source
3130

@@ -530,8 +529,8 @@ def _run_interface(self, runtime):
530529
data1 = nb.load(self.inputs.volume1).get_data()
531530
data2 = nb.load(self.inputs.volume2).get_data()
532531

533-
assert_equal(data1, data2)
534-
532+
if not np.all(data1 == data2):
533+
raise RuntimeError('Input images are not exactly equal')
535534
return runtime
536535

537536

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ xvfbwrapper
1212
psutil
1313
funcsigs
1414
configparser
15+
doctest-ignore-unicode

0 commit comments

Comments
 (0)