Merge remote-tracking branch 'upstream/master' into enh/cifti2

* upstream/master: (36 commits)
  MAINT: Start 2.2 development
  MAINT: 2.1.x maintenance branch
  Rel: set version for 2.1 release
  DOC: update release procedure with buildbot
  DOC: various documentation fixes
  DOC: add link for Mock library
  DOC: update release doc with travis-ci tests
  DOC: suggest warehouse as pypi upload target
  DOC: more streamlining of release doc
  DOC: more small edits to Changelog, release doc
  DOC: add Changelog for parrec2nii code change
  RF: do a more fancy Mock dance
  RF: rewrite comments with new behavior
  RF+API: add qform, sform code 1 for parrec2nii
  DOC: add deprecations to Changelog
  DOC: rewrite Changelog for Yarik
  DOC: add missing credit for reviews
  RF: move parrec2nii code into own module
  TEST: Only add virtualenv bindir if virtualenv environment variable exists.
  TEST: Fixed virtualenv environment variable name.
  ...

Author: satra

.mailmap

@@ -31,3 +31,7 @@ Ben Cipollini <[email protected]> Ben Cipollini <[email protected]>
 Chris Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
 Chris Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
 Chris Markiewicz <[email protected]> Chris Johnson <[email protected]>
+Jaakko Leppäkangas <[email protected]> jaeilepp <[email protected]>
+Ariel Rokem <[email protected]> arokem <[email protected]>
+Oliver P. Hinds <[email protected]> ohinds <[email protected]>
+Marc-Alexandre Côté <[email protected]> Marc-Alexandre Cote <[email protected]>

.travis.yml

@@ -88,7 +88,7 @@ before_install:
     - source venv/bin/activate
     - python --version # just to check
     - pip install -U pip wheel  # upgrade to latest pip find 3.5 wheels; wheel to avoid errors
-    - retry pip install nose flake8  # always
+    - retry pip install nose flake8 mock  # always
     - wheelhouse_pip_install $EXTRA_PIP_FLAGS $DEPENDS
     # pydicom <= 0.9.8 doesn't install on python 3
     - if [ "${TRAVIS_PYTHON_VERSION:0:1}" == "2" ]; then

AUTHOR

@@ -1,3 +1,7 @@
 Matthew Brett <[email protected]>
 Michael Hanke <[email protected]>
+Ben Cipollini <[email protected]>
+Marc-Alexandre Côté <[email protected]>
+Chris Markiewicz <[email protected]>
 Stephan Gerhard <[email protected]>
+Eric Larson <[email protected]>

Changelog

@@ -16,9 +16,9 @@ Read / write access to some common neuroimaging file formats
 This package provides read +/- write access to some common medical and
 neuroimaging file formats, including: ANALYZE_ (plain, SPM99, SPM2 and later),
 GIFTI_, NIfTI1_, NIfTI2_, MINC1_, MINC2_, MGH_ and ECAT_ as well as Philips
-PAR/REC.  We can read and write Freesurfer_ geometry, and read Freesurfer
-morphometry and annotation files.  There is some very limited support for
-DICOM_.  NiBabel is the successor of PyNIfTI_.
+PAR/REC.  We can read and write FreeSurfer_ geometry, annotation and
+morphometry files.  There is some very limited support for DICOM_.  NiBabel is
+the successor of PyNIfTI_.
 
 .. _ANALYZE: http://www.grahamwideman.com/gw/brain/analyze/formatdoc.htm
 .. _NIfTI1: http://nifti.nimh.nih.gov/nifti-1/
@@ -34,8 +34,9 @@ DICOM_.  NiBabel is the successor of PyNIfTI_.
 .. _Freesurfer: https://surfer.nmr.mgh.harvard.edu
 .. _DICOM: http://medical.nema.org/
 
-The various image format classes give full or selective access to header (meta)
-information and access to the image data is made available via NumPy arrays.
+The various image format classes give full or selective access to header
+(meta) information and access to the image data is made available via NumPy
+arrays.
 
 Website
 =======
@@ -52,15 +53,19 @@ Please send any questions or suggestions to the `neuroimaging mailing list
 Code
 ====
 
-You can find our sources and single-click downloads:
+Install nibabel with::
 
-* `Main repository`_ on Github;
-* Documentation_ for all releases and current development tree;
-* Download the `current release`_ from pypi;
-* Download `current development version`_ as a zip file;
-* Downloads of all `available releases`_.
+    pip install nibabel
 
-.. _main repository: https://github.com/nipy/nibabel
+You may also be interested in:
+
+* the `nibabel code repository`_ on Github;
+* documentation_ for all releases and current development tree;
+* download the `current release`_ from pypi;
+* download `current development version`_ as a zip file;
+* downloads of all `available releases`_.
+
+.. _nibabel code repository: https://github.com/nipy/nibabel
 .. _Documentation: http://nipy.org/nibabel
 .. _current release: https://pypi.python.org/pypi/nibabel
 .. _current development version: https://github.com/nipy/nibabel/archive/master.zip
@@ -69,6 +74,6 @@ You can find our sources and single-click downloads:
 License
 =======
 
-Nibabel is licensed under the terms of the MIT license. Some code included with
-nibabel is licensed under the BSD license.  Please see the COPYING file in the
-nibabel distribution.
+Nibabel is licensed under the terms of the MIT license. Some code included
+with nibabel is licensed under the BSD license.  Please see the COPYING file
+in the nibabel distribution.

README.rst

@@ -46,7 +46,7 @@ install:
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
 
   # Install the dependencies of the project.
-  - "conda install --yes --quiet numpy scipy matplotlib nose h5py"
+  - "conda install --yes --quiet numpy scipy matplotlib nose h5py mock"
   - "pip install pydicom"
   - "python setup.py install"
   - "SET NIBABEL_DATA_DIR=%CD%\\nibabel-data"