Merge remote-tracking branch 'nipype/master' into updt2boutiq

Author: alexsavio

.coveragerc

@@ -4,6 +4,5 @@ source = nipype
 include = */nipype/*
 omit =
     */nipype/external/*
-    */nipype/workflows/*
     */nipype/fixes/*
     */setup.py

.dockerignore

@@ -1,7 +1,34 @@
-.git/
-*.pyc
-*.egg-info
+# python cache
+__pycache__/**/*
 __pycache__
-docker/nipype_*
-docker/test-*
-.coverage
+*.pyc
+
+# python distribution
+build/**/*
+build
+dist/**/*
+dist
+nipype.egg-info/**/*
+nipype.egg-info
+.eggs/**/*
+.eggs
+src/**/*
+src/
+
+# git
+.gitignore
+.git/**/*
+.git
+
+# other
+docs/**/*
+docs/
+.coverage
+.coveragerc
+codecov.yml
+rtd_requirements.txt
+circle.yml
+Vagrantfile
+.travis.yml
+.noserc
+

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,10 @@
+### Summary
+
+### Actual behavior
+
+### Expected behavior
+
+### How to replicate the behavior
+
+### Platform details:
+please paste the output of: `python -c "import nipype; print(nipype.get_info()); print(nipype.__version__)"`

.gitignore

@@ -13,6 +13,7 @@
 .project
 .settings
 .pydevproject
+.eggs
 .idea/
 /documentation.zip
 .DS_Store
@@ -24,4 +25,4 @@ htmlcov/
 __pycache__/
 *~
 .ipynb_checkpoints/
-.ruby-version
+.ruby-version

.travis.yml

@@ -1,5 +1,6 @@
 cache:
-- apt
+  apt: true
+
 language: python
 python:
 - 2.7
@@ -10,41 +11,38 @@ env:
 - INSTALL_DEB_DEPENDECIES=false NIPYPE_EXTRAS="doc,tests,fmri,profiler"
 - INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,fmri,profiler,duecredit"
 before_install:
-- function bef_inst {
-  wget http://repo.continuum.io/miniconda/Miniconda${TRAVIS_PYTHON_VERSION:0:1}-latest-Linux-x86_64.sh
-  -O /home/travis/.cache/miniconda.sh &&
-  bash /home/travis/.cache/miniconda.sh -b -p /home/travis/miniconda &&
-  export PATH=/home/travis/miniconda/bin:$PATH &&
+- function apt_inst {
   if $INSTALL_DEB_DEPENDECIES; then sudo rm -rf /dev/shm; fi &&
   if $INSTALL_DEB_DEPENDECIES; then sudo ln -s /run/shm /dev/shm; fi &&
   bash <(wget -q -O- http://neuro.debian.net/_files/neurodebian-travis.sh) &&
   sudo apt-get -y update &&
-  sudo apt-get -y install xvfb fusefat &&
+  sudo apt-get -y install xvfb fusefat graphviz &&
   if $INSTALL_DEB_DEPENDECIES; then travis_retry sudo apt-get install -y -qq
   fsl afni elastix fsl-atlases; fi &&
   if $INSTALL_DEB_DEPENDECIES; then
     source /etc/fsl/fsl.sh;
-    source /etc/afni/afni.sh; 
+    source /etc/afni/afni.sh;
     export FSLOUTPUTTYPE=NIFTI_GZ; fi }
-- travis_retry bef_inst
-install:
-#  Add install of vtk and mayavi to test mesh (disabled): conda install -y vtk mayavi &&
-- function inst {
+- function conda_inst {
+  export CONDA_HOME=$HOME/conda &&
+  wget https://repo.continuum.io/miniconda/Miniconda${TRAVIS_PYTHON_VERSION:0:1}-latest-Linux-x86_64.sh
+    -O /home/travis/.cache/conda.sh &&
+  bash /home/travis/.cache/conda.sh -b -p ${CONDA_HOME} &&
+  export PATH=${CONDA_HOME}/bin:$PATH &&
+  hash -r &&
+  conda config --set always_yes yes --set changeps1 no &&
+  conda update -q conda &&
+  conda install python=${TRAVIS_PYTHON_VERSION} &&
   conda config --add channels conda-forge &&
-  conda update --yes conda &&
-  conda update --all -y python=$TRAVIS_PYTHON_VERSION &&
-  conda install -y nipype &&
-  rm -r /home/travis/miniconda/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/nipype* &&
-  pip install -r requirements.txt &&
-  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}; }
-- travis_retry inst
+  conda install -y nipype icu &&
+  rm -r ${CONDA_HOME}/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/nipype*; }
+#  Add install of vtk and mayavi to test mesh (disabled): conda install -y vtk mayavi
+- travis_retry apt_inst
+- travis_retry conda_inst
+install:
+- travis_retry pip install -e .[$NIPYPE_EXTRAS]
 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
-after_success:
-- bash <(curl -s https://codecov.io/bash) -t ac172a50-8e66-42e5-8822-5373fcf54686 -cF unittests
+- py.test --doctest-modules nipype
 deploy:
   provider: pypi
   user: satra

CHANGES

@@ -1,6 +1,30 @@
-Upcoming release 0.13
+Upcoming Release
 =====================
 
+* ENH: Enable new BBRegister init options for FSv6+ (https://github.com/nipy/nipype/pull/1811)
+* REF: Splits nipype.interfaces.utility into base, csv, and wrappers (https://github.com/nipy/nipype/pull/1828)
+* FIX: Makespec now runs with nipype in current directory (https://github.com/nipy/nipype/pull/1813)
+* FIX: Flexible nifti opening with mmap if Numpy < 1.12.0 (https://github.com/nipy/nipype/pull/1796 + https://github.com/nipy/nipype/pull/1831)
+* ENH: DVARS includes intensity normalization feature - turned on by default (https://github.com/nipy/nipype/pull/1827)
+* FIX: DVARS is correctly using sum of squares instead of standard deviation (https://github.com/nipy/nipype/pull/1827)
+* ENH: Refactoring of nipype.interfaces.utility (https://github.com/nipy/nipype/pull/1828)
+* FIX: CircleCI were failing silently. Some fixes to tests (https://github.com/nipy/nipype/pull/1833)
+* FIX: Issues in Docker image permissions, and docker documentation (https://github.com/nipy/nipype/pull/1825)
+* ENH: Revised all Dockerfiles and automated deployment to Docker Hub
+       from CircleCI (https://github.com/nipy/nipype/pull/1815)
+* ENH: Update ReconAll interface for FreeSurfer v6.0.0 (https://github.com/nipy/nipype/pull/1790)
+* FIX: Cast DVARS float outputs to avoid memmap error (https://github.com/nipy/nipype/pull/1777)
+* FIX: FSL FNIRT intensity mapping files (https://github.com/nipy/nipype/pull/1799)
+* ENH: Additional outputs generated by FSL EDDY (https://github.com/nipy/nipype/pull/1793)
+* TST: Parallelize CircleCI build across 4 containers (https://github.com/nipy/nipype/pull/1769)
+
+
+0.13.0-rc1 (January 4, 2017)
+===============================
+ 
+* FIX: Compatibility with traits 4.6 (https://github.com/nipy/nipype/pull/1770)
+* FIX: Multiproc deadlock (https://github.com/nipy/nipype/pull/1756)
+* TST: Replace nose and unittest with pytest (https://github.com/nipy/nipype/pull/1722, https://github.com/nipy/nipype/pull/1751)
 * FIX: Semaphore capture using MultiProc plugin (https://github.com/nipy/nipype/pull/1689)
 * REF: Refactor AFNI interfaces (https://github.com/nipy/nipype/pull/1678, https://github.com/nipy/nipype/pull/1680)
 * ENH: Move nipype commands to group command using click (https://github.com/nipy/nipype/pull/1608)