fixing extras

Author: oesteban

.travis.yml

@@ -6,9 +6,9 @@ python:
 - 3.4
 - 3.5
 env:
-- INSTALL_DEB_DEPENDECIES=true
-- INSTALL_DEB_DEPENDECIES=false
-- INSTALL_DEB_DEPENDECIES=true DUECREDIT_ENABLE=yes
+- INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,fmri,profiler"
+- INSTALL_DEB_DEPENDECIES=false NIPYPE_EXTRAS="doc,tests,fmri,profiler"
+- INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,fmri,profiler,duecredit"
 before_install:
 - wget http://repo.continuum.io/miniconda/Miniconda${TRAVIS_PYTHON_VERSION:0:1}-latest-Linux-x86_64.sh
   -O /home/travis/.cache/miniconda.sh
@@ -29,16 +29,13 @@ install:
 - conda config --add channels conda-forge
 - conda update --yes conda
 - conda update --all -y python=$TRAVIS_PYTHON_VERSION
-# - if [[ "${INSTALL_DEB_DEPENDECIES}" == "true" && ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]]; then
-#   conda install -y vtk mayavi; fi
 - conda install -y nipype
-- pip install python-coveralls coverage doctest-ignore-unicode
-- if [ ! -z "$DUECREDIT_ENABLE"]; then pip install duecredit; fi
 - rm -r /home/travis/miniconda/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/nipype*
+# - if [[ "${INSTALL_DEB_DEPENDECIES}" == "true" && ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]]; then
+#   conda install -y vtk mayavi; fi
 - pip install -r requirements.txt
-- pip install -e .
-- export COVERAGE_PROCESS_START=$(pwd)/.coveragerc
-- export COVERAGE_DATA_FILE=$(pwd)/.coverage
+- pip install -e .[$NIPYPE_EXTRAS]
+- export COVERAGE_PROCESS_START=$(pwd)/.coveragerc && export COVERAGE_DATA_FILE=$(pwd)/.coverage
 - echo "data_file = ${COVERAGE_DATA_FILE}" >> ${COVERAGE_PROCESS_START}
 script:
 - python -W once:FSL:UserWarning:nipype `which nosetests` --with-doctest --with-doctest-ignore-unicode --with-cov --cover-package nipype --logging-level=DEBUG --verbosity=3

nipype/info.py

@@ -158,7 +158,9 @@ def get_nipype_gitversion():
     'doc': ['Sphinx>=0.3'],
     'tests': TESTS_REQUIRES,
     'fmri': ['nitime'],
-    'profiler': ['psutil']
+    'profiler': ['psutil'],
+    'duecredit': ['duecredit'],
+    # 'mesh': ['mayavi']  # Enable when it works
 }
 
 # Enable a handle to install all extra dependencies at once

setup.py

@@ -17,8 +17,7 @@
 from glob import glob
 import os
 from os.path import join as pjoin
-
-from builtins import str, bytes, open
+from io import open
 
 # Commit hash writing, and dependency checking
 from setuptools.command.build_py import build_py
@@ -72,7 +71,7 @@ def run(self):
                                 shell=True)
         repo_commit, _ = proc.communicate()
         # Fix for python 3
-        repo_commit = str(repo_commit)
+        repo_commit = '{}'.format(repo_commit)
         # We write the installation commit even if it's empty
         cfg_parser = ConfigParser()
         cfg_parser.read(pjoin('nipype', 'COMMIT_INFO.txt'))
@@ -93,7 +92,7 @@ def main():
                      for val in os.listdir(pjoin(thispath, 'nipype', 'testing', 'data'))
                      if not os.path.isdir(pjoin(thispath, 'nipype', 'testing', 'data', val))]
 
-    testdatafiles+=[
+    testdatafiles += [
         pjoin('testing', 'data', 'dicomdir', '*'),
         pjoin('testing', 'data', 'bedpostxout', '*'),
         pjoin('testing', 'data', 'tbss_dir', '*'),
@@ -128,7 +127,7 @@ def main():
         platforms=ldict['PLATFORMS'],
         version=ldict['VERSION'],
         install_requires=ldict['REQUIRES'],
-        setup_requires=['configparser'],
+        setup_requires=['future', 'configparser'],
         provides=ldict['PROVIDES'],
         packages=[
             'nipype',
@@ -253,7 +252,7 @@ def main():
 
         package_data={'nipype': testdatafiles},
         scripts=glob('bin/*'),
-        cmdclass={ 'build_py': BuildWithCommitInfoCommand },
+        cmdclass={'build_py': BuildWithCommitInfoCommand},
         tests_require=ldict['TESTS_REQUIRES'],
         test_suite='nose.collector',
         zip_safe=False,