From 5e4468dd6ef7439a90d3d36bc9913b966b4afe39 Mon Sep 17 00:00:00 2001 From: Shoshana Berleant Date: Wed, 1 Jun 2016 22:24:47 +0000 Subject: [PATCH 1/3] fixed weird little unicode test bug on Ubuntu --- nipype/interfaces/io.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nipype/interfaces/io.py b/nipype/interfaces/io.py index 0035971f31..799ed4ff22 100644 --- a/nipype/interfaces/io.py +++ b/nipype/interfaces/io.py @@ -2459,7 +2459,7 @@ class JSONFileGrabber(IOBase): >>> jsonSource.inputs.in_file = 'jsongrabber.txt' >>> res = jsonSource.run() >>> pprint.pprint(res.outputs.get()) # doctest: +NORMALIZE_WHITESPACE - {'param1': 'exampleStr', 'param2': 4, 'param3': 1.0} + {'param1': u'exampleStr', 'param2': 4, 'param3': 1.0} """ From 833a8404950cd898ee3b4349a36bc2e199864009 Mon Sep 17 00:00:00 2001 From: Shoshana Berleant Date: Wed, 1 Jun 2016 22:59:36 -0700 Subject: [PATCH 2/3] prev commit failed on mac; make test more flexible --- nipype/interfaces/io.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nipype/interfaces/io.py b/nipype/interfaces/io.py index 799ed4ff22..cf061ff84d 100644 --- a/nipype/interfaces/io.py +++ b/nipype/interfaces/io.py @@ -2458,8 +2458,8 @@ class JSONFileGrabber(IOBase): {'param1': 'overrideMe', 'param3': 1.0} >>> jsonSource.inputs.in_file = 'jsongrabber.txt' >>> res = jsonSource.run() - >>> pprint.pprint(res.outputs.get()) # doctest: +NORMALIZE_WHITESPACE - {'param1': u'exampleStr', 'param2': 4, 'param3': 1.0} + >>> pprint.pprint(res.outputs.get()) # doctest: +NORMALIZE_WHITESPACE, +ELLIPSIS + {'param1': ...'exampleStr', 'param2': 4, 'param3': 1.0} """ From f56ab1b6af9b3ef27a66464c2e242d2cf2aa0e97 Mon Sep 17 00:00:00 2001 From: Shoshana Berleant Date: Tue, 7 Jun 2016 05:03:42 +0000 Subject: [PATCH 3/3] remove out-of-date (?) test warning --- nipype/__init__.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/nipype/__init__.py b/nipype/__init__.py index e38e140c17..241842a7bc 100644 --- a/nipype/__init__.py +++ b/nipype/__init__.py @@ -55,26 +55,10 @@ def test(self, label='fast', verbose=1, extra_argv=['--exe'], test = _NoseTester().test del nosetester - -def _test_local_install(): - """ Warn the user that running with nipy being - imported locally is a bad idea. - """ - if os.getcwd() == os.sep.join( - os.path.abspath(__file__).split(os.sep)[:-2]): - import warnings - warnings.warn('Running the tests from the install directory may ' - 'trigger some failures') - -_test_local_install() - # Set up package information function from .pkg_info import get_pkg_info as _get_pkg_info get_info = lambda: _get_pkg_info(os.path.dirname(__file__)) -# Cleanup namespace -del _test_local_install - # If this file is exec after being imported, the following lines will # fail try: