[ENH] Refactor VTK and tvtk -based interfaces

nipype/algorithms/mesh.py

@@ -72,13 +72,6 @@ def _run_interface(self, runtime):
         except ImportError:
             raise ImportError('Interface P2PDistance requires tvtk')
 
-        try:
-            from enthought.etsconfig.api import ETSConfig
-            ETSConfig.toolkit = 'null'
-        except ImportError:
-            iflogger.warn(('ETS toolkit could not be imported'))
-            pass
-
         r1 = tvtk.PolyDataReader(file_name=self.inputs.surface1)
         r2 = tvtk.PolyDataReader(file_name=self.inputs.surface2)
         vtk1 = r1.output

nipype/pipeline/plugins/base.py

@@ -109,17 +109,40 @@ def create_pyscript(node, updatehash=False, store_exception=True):
     pkl_file = os.path.join(batch_dir, 'node_%s.pklz' % suffix)
     savepkl(pkl_file, dict(node=node, updatehash=updatehash))
     mpl_backend = node.config["execution"]["matplotlib_backend"]
+    ets_toolkit = node.config["execution"]["ets_toolkit"]
     # create python script to load and trap exception
     cmdstr = """import os
 import sys
 
 can_import_matplotlib = True #Silently allow matplotlib to be ignored
+can_import_ets = False #Silently allow ets to be ignored
 try:
     import matplotlib
     matplotlib.use('%s')
 except ImportError:
     can_import_matplotlib = False
     pass
+except
+
+try:
+    from enthought.etsconfig.api import ETSConfig
+    can_import_ets = True
+except ImportError:
+    pass
+
+if not can_import_ets:
+    try:
+        from traits.etsconfig.etsconfig import ETSConfig
+        can_import_ets = True
+    except ImportError:
+        pass
+
+if can_import_ets:
+    try:
+        ETSConfig.toolkit = '%s'
+    except ValueError:
+        pass
+
 
 from nipype import config, logging
 from nipype.utils.filemanip import loadpkl, savepkl
@@ -134,9 +157,12 @@ def create_pyscript(node, updatehash=False, store_exception=True):
         from collections import OrderedDict
     config_dict=%s
     config.update_config(config_dict)
+
     ## Only configure matplotlib if it was successfully imported, matplotlib is an optional component to nipype
     if can_import_matplotlib:
         config.update_matplotlib()
+    if can_import_ets:
+        config.update_ets()
     logging.update_logging(config)
     traceback=None
     cwd = os.getcwd()
@@ -168,7 +194,8 @@ def create_pyscript(node, updatehash=False, store_exception=True):
         report_crash(info['node'], traceback, gethostname())
     raise Exception(e)
 """
-    cmdstr = cmdstr % (mpl_backend, pkl_file, batch_dir, node.config, suffix)
+    cmdstr = cmdstr % (mpl_backend, ets_toolkit, pkl_file,
+                       batch_dir, node.config, suffix)
     pyscript = os.path.join(batch_dir, 'pyscript_%s.py' % suffix)
     fp = open(pyscript, 'wt')
     fp.writelines(cmdstr)

nipype/utils/config.py

@@ -38,6 +38,7 @@
 keep_inputs = false
 local_hash_check = true
 matplotlib_backend = Agg
+ets_toolkit = null
 plugin = Linear
 remove_node_directories = false
 remove_unnecessary_outputs = true
@@ -54,6 +55,7 @@
 interval = 1209600
 """ % (homedir, os.getcwd())
 
+
 class NipypeConfig(object):
     """Base nipype config class
     """
@@ -151,6 +153,27 @@ def update_matplotlib(self):
         import matplotlib
         matplotlib.use(self.get('execution', 'matplotlib_backend'))
 
+    def update_ets(self):
+        can_import_ets = False
+        try:
+            from enthought.etsconfig.api import ETSConfig
+            can_import_ets = True
+        except ImportError:
+            pass
+
+        if not can_import_ets:
+            try:
+                from traits.etsconfig.etsconfig import ETSConfig
+                can_import_ets = True
+            except ImportError:
+                pass
+
+        if can_import_ets:
+            try:
+                ETSConfig.toolkit = '%s'
+            except ValueError:
+                pass
+
     def enable_provenance(self):
         self._config.set('execution', 'write_provenance', 'true')
         self._config.set('execution', 'hash_method', 'content')