Merge branch 'master' into enh/ETSConfigTookit

Author: oesteban

circle.yml

@@ -31,8 +31,8 @@ dependencies:
     - pip install -e git+https://github.com/enthought/etsproxy.git#egg=etsproxy
     - pip install -e git+https://github.com/enthought/ets.git#egg=ets
     - gem install fakes3
-    - if [[ ! -d ~/examples/data ]]; then wget "http://tcpdiag.dl.sourceforge.net/project/nipy/nipype/nipype-0.2/nipype-tutorial.tar.bz2"; tar jxvf nipype-tutorial.tar.bz2; mkdir ~/examples; mv nipype-tutorial/* ~/examples/; fi
-    - if [[ ! -d ~/examples/fsl_course_data ]]; then wget -c "http://fsl.fmrib.ox.ac.uk/fslcourse/fdt1.tar.gz" ; wget -c "http://fsl.fmrib.ox.ac.uk/fslcourse/fdt2.tar.gz"; wget -c "http://fsl.fmrib.ox.ac.uk/fslcourse/tbss.tar.gz"; mkdir ~/examples/fsl_course_data; tar zxvf fdt1.tar.gz -C ~/examples/fsl_course_data; tar zxvf fdt2.tar.gz -C ~/examples/fsl_course_data; tar zxvf tbss.tar.gz -C ~/examples/fsl_course_data; fi
+    - if [[ ! -d ~/examples/data ]]; then wget "http://tcpdiag.dl.sourceforge.net/project/nipy/nipype/nipype-0.2/nipype-tutorial.tar.bz2" && tar jxvf nipype-tutorial.tar.bz2 && mv nipype-tutorial/* ~/examples/; fi
+    - if [[ ! -d ~/examples/fsl_course_data ]]; then wget -c "http://fsl.fmrib.ox.ac.uk/fslcourse/fdt1.tar.gz" && wget -c "http://fsl.fmrib.ox.ac.uk/fslcourse/fdt2.tar.gz" && wget -c "http://fsl.fmrib.ox.ac.uk/fslcourse/tbss.tar.gz" && mkdir ~/examples/fsl_course_data && tar zxvf fdt1.tar.gz -C ~/examples/fsl_course_data && tar zxvf fdt2.tar.gz -C ~/examples/fsl_course_data && tar zxvf tbss.tar.gz -C ~/examples/fsl_course_data; fi
     - bash ~/nipype/tools/install_spm_mcr.sh
     - mkdir -p ~/.nipype && echo '[logging]' > ~/.nipype/nipype.cfg && echo 'workflow_level = DEBUG' >> ~/.nipype/nipype.cfg && echo 'interface_level = DEBUG' >> ~/.nipype/nipype.cfg && echo 'filemanip_level = DEBUG' >> ~/.nipype/nipype.cfg
 machine:

nipype/pipeline/engine/workflows.py

@@ -644,7 +644,13 @@ def _write_report_info(self, workingdir, name, graph):
                                            value=1))
         save_json(graph_file, json_dict)
         graph_file = op.join(report_dir, 'graph.json')
-        template = '%%0%dd_' % np.ceil(np.log10(len(nodes))).astype(int)
+        # Avoid RuntimeWarning: divide by zero encountered in log10
+        num_nodes = len(nodes)
+        if num_nodes > 0:
+           index_name = np.ceil(np.log10(num_nodes)).astype(int)
+        else:
+            index_name = 0
+        template = '%%0%dd_' % index_name
 
         def getname(u, i):
             name_parts = u.fullname.split('.')