Merge branch 'master' into fix/CheckInputsLoggingHashDiff

Author: oesteban

.travis.yml

@@ -33,8 +33,6 @@ install:
 - pip install python-coveralls
 - pip install nose-cov
 - pip install -r requirements.txt  # finish remaining requirements
-- pip install https://github.com/RDFLib/rdflib/archive/master.zip
-- pip install https://github.com/trungdong/prov/archive/rdf.zip
 - python setup.py install
 script:
 - python -W once:FSL:UserWarning:nipype `which nosetests` --with-doctest --with-cov --cover-package nipype --cov-config .coveragerc --logging-level=INFO

CHANGES

@@ -2,6 +2,8 @@ Next release
 ============
 
 * FIX: Minor bugfix logging hash differences (https://github.com/nipy/nipype/pull/1298)
+* FIX: Use released Prov python library (https://github.com/nipy/nipype/pull/1279)
+* ENH: Support for Python 3 (https://github.com/nipy/nipype/pull/1221)
 * FIX: VTK version check missing when using tvtk (https://github.com/nipy/nipype/pull/1219)
 * ENH: Added an OAR scheduler plugin (https://github.com/nipy/nipype/pull/1259)
 * ENH: New ANTs interface: antsBrainExtraction (https://github.com/nipy/nipype/pull/1231)

circle.yml

@@ -15,7 +15,7 @@ dependencies:
     - if [[ ! -d ~/fsl ]]; then wget "http://fsl.fmrib.ox.ac.uk/fsldownloads/fsl-5.0.9-centos6_64.tar.gz"; tar zxvf fsl-5.0.9-centos6_64.tar.gz; mv fsl ~/fsl; 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; mkdir ~/examples; mv nipype-tutorial/* ~/examples/; fi
     # we download this manually because CircleCI does not cache apt
-    - if [[ ! -d ~/examples/feeds ]]; then wget "http://fsl.fmrib.ox.ac.uk/fsldownloads/fsl-5.0.9-feeds.tar.gz"; tar zxvf fsl-5.0.8-feeds.tar.gz; mv feeds ~/examples/; fi
+    - if [[ ! -d ~/examples/feeds ]]; then wget "http://fsl.fmrib.ox.ac.uk/fsldownloads/fsl-5.0.9-feeds.tar.gz"; tar zxvf fsl-5.0.9-feeds.tar.gz; mv feeds ~/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

nipype/COMMIT_INFO.txt

@@ -1,6 +1,6 @@
 # This is an ini file that may contain information about the code state
 [commit hash]
 # The line below may contain a valid hash if it has been substituted during 'git archive'
-archive_subst_hash=$Format:%h$
+archive_subst_hash=$Format:%%h$
 # This line may be modified by the install process
 install_hash=