fix tests

Author: oesteban

docker/nipype_test/Dockerfile_base

@@ -110,7 +110,18 @@ ENV LANG=C.UTF-8 \
 
 # Add conda-forge channel in conda
 RUN conda config --add channels conda-forge && \
-    conda install -y lockfile nipype matplotlib sphinx boto boto3 coverage mock pbr nitime dipy && \
+    conda install -y lockfile \
+                     nipype \
+                     matplotlib \
+                     sphinx \
+                     boto \
+                     boto3 \
+                     coverage \
+                     mock \
+                     pbr \
+                     nitime \
+                     dipy \
+                     pandas && \
     pip install nose-cov doctest-ignore-unicode configparser
 
 CMD ["/bin/bash"]

docker/nipype_test/Dockerfile_py27

@@ -31,8 +31,9 @@ MAINTAINER The nipype developers https://github.com/nipy/nipype
 
 # Downgrade python to 2.7
 RUN conda update -y conda && \
-    conda update --all -y python=2.7
-   
+    conda update --all -y python=2.7 && \
+    pip install nose-cov doctest-ignore-unicode configparser
+
 COPY docker/circleci/run_* /usr/bin/
 RUN chmod +x /usr/bin/run_*
 
@@ -45,6 +46,6 @@ RUN pip install -r /root/src/nipype/requirements.txt
 COPY . /root/src/nipype
 RUN rm -r /usr/local/miniconda/lib/python2.7/site-packages/nipype* && \
     cd /root/src/nipype && \
-    pip install -e . 
+    pip install -e .
 
 CMD ["/bin/bash"]

nipype/interfaces/spm/base.py

@@ -420,7 +420,11 @@ def _generate_job(self, prefix='', contents=None):
                         jobstring += self._generate_job(prefix=None,
                                                         contents=val)
                     elif isinstance(val, list):
-                        val_format = ', '.join(['\'{}\''] * len(val)).format
+                        items_format = []
+                        for el in val:
+                            items_format += ['{}' if not isinstance(el, (str, bytes))
+                                             else '\'{}\'']
+                        val_format = ', '.join(items_format).format
                         jobstring += '[{}];...\n'.format(val_format(*val))
                     elif isinstance(val, (str, bytes)):
                         jobstring += '\'{}\';...\n'.format(val)