More Python3 fixes

Author: tillea

debian/patches/python3.patch

@@ -35,6 +35,19 @@ Description: Force usage of Python3
 
  trailing-spaces:
  	find . -name "*[.py|.rst]" -type f | xargs perl -pi -e 's/[ \t]*$$//'
+@@ -56,10 +56,10 @@ inplace:
+ 	$(PYTHON) setup.py build_ext -i
+ 
+ test-code: in
+-	py.test --doctest-modules nipype
++	py.test-3 --doctest-modules nipype
+ 
+ test-coverage: clean-tests in
+-	py.test --doctest-modules --cov-config .coveragerc --cov=nipype nipype
++	py.test-3 --doctest-modules --cov-config .coveragerc --cov=nipype nipype
+ 
+ test: tests # just another name
+ tests: clean test-code
 @@ -70,7 +70,7 @@ html:
 
  specs:
@@ -66,3 +79,14 @@ Description: Force usage of Python3
  ../../../examples/frontiers_paper""")
  os.chdir(doc_path)
 
+--- a/nipype/__init__.py
++++ b/nipype/__init__.py
+@@ -36,7 +36,7 @@ class NipypeTester(object):
+         try:
+             import pytest
+         except ImportError:
+-            raise RuntimeError("py.test not installed, run: pip install pytest")
++            raise RuntimeError("py.test-3 not installed, run: pip install pytest")
+         args = []
+         if not doctests:
+             args.extend(["-p", "no:doctest"])

debian/rules

@@ -35,7 +35,7 @@ override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	export PYTHONPATH=$(shell pybuild --print build_dir --interpreter python3); \
 	cd build && \
-         MPLCONFIGDIR=$(CURDIR)/build LC_ALL=C.UTF-8 py.test -v --doctest-modules ../nipype
+         MPLCONFIGDIR=$(CURDIR)/build LC_ALL=C.UTF-8 py.test-3 -v --doctest-modules ../nipype
     # test_mesh_ops needs X for bloody tvtk.api, and then fails anyways with current mayavi2/tvtk:
     # https://github.com/nipy/nipype/issues/1218, so skipping it for now
 endif