Merge pull request #541 from nipy/changelog

MRG: pre-release book-keeping

Author: matthew-brett

.mailmap

@@ -17,7 +17,7 @@ Cindee Madison <cindee@berkeley.edu> CindeeM <cindee@berkeley.edu>
 Cindee Madison <cindee@berkeley.edu> cindeem <cindee@berkeley.edu>
 Ian Nimmo-Smith <iannimmosmith@gmail.com> Ian Nimmo-Smith <ian.nimmo-smith@mrc-cbu.cam.ac.uk>
 Jean-Baptiste Poline <jbpoline@gmail.com> jbpoline <jbpoline@gmail.com>
-Félix C. Morency <felix.morency@gmail.com> Felix C. Morency <felix.c.morency@usherbrooke.ca> Félix C. Morency <felix.c.morency@usherbrooke.ca>
+Félix C. Morency <felix.morency@gmail.com> Felix C. Morency <felix.c.morency@usherbrooke.ca>
 Félix C. Morency <felix.morency@gmail.com> Félix C. Morency <felix.c.morency@usherbrooke.ca>
 Krish Subramaniam <krish.subramaniam@gmail.com> Krish Subramaniam <krish@monster.nmr.mgh.harvard.edu>
 Eric Larson <larson.eric.d@gmail.com> Eric89GXL <larson.eric.d@gmail.com>

Changelog

@@ -32,6 +32,8 @@ New features
 
 * CIFTI support (pr/249) (Satra Ghosh, Michiel Cottaar, BC, CM, Demian
   Wassermann, MB)
+* Support for MRtrix TCK streamlines file format (pr/486) (MC, reviewed by
+  MB, Arnaud Bore, J-Donald Tournier, Jean-Christophe Houde)
 
 Enhancements
 ------------
@@ -45,12 +47,16 @@ Enhancements
 * Allow dtype specifiers as fileslice input (pr/485) (MB)
 * Support "headerless" ArrayProxy specification, enabling memory-efficient
   ArrayProxy reshaping (pr/521) (CM)
+* Allow unknown NIfTI intent codes, add FSL codes (pr/528) (Paul McCarthy)
+* Improve error handling for ``img.__getitem__`` (pr/533) (Ariel Rokem)
 
 Bug fixes
 ---------
 
 * Miscellaneous MINC reader fixes (pr/493) (Robert D. Vincent, reviewed by CM,
   MB)
+* Fix corner case in ``wrapstruct.get`` (pr/516) (Paul McCarthy, reviewed by
+  CM, MB)
 
 Maintenance
 -----------
@@ -65,6 +71,7 @@ API changes and deprecations
 * ``header`` argument to ``ArrayProxy.__init__`` is renamed to ``spec``
 * Deprecation of ``header`` property of ``ArrayProxy`` object, for removal in
   3.0
+* ``wrapstruct.get`` now returns entries evaluating ``False``, instead of ``None``
 
 
 2.1 (Monday 22 August 2016)

doc/source/index.rst

@@ -74,6 +74,9 @@ contributed code and discussion (in rough order of appearance):
 * Robert D. Vincent
 * Ivan Gonzalez
 * Demian Wassermann
+* Paul McCarthy
+* Fernando Pérez García
+* Venky Reddy
 
 License reprise
 ===============

doc/source/installation.rst

@@ -87,7 +87,7 @@ Requirements
     .travis.yml
 
 *  Python_ 2.7, or >= 3.4
-*  NumPy_ 1.7 or greater
+*  NumPy_ 1.7.1 or greater
 *  Six_ 1.3 or greater
 *  SciPy_ (optional, for full SPM-ANALYZE support)
 *  PyDICOM_ 0.9.7 or greater (optional, for DICOM support)

requirements.txt

@@ -6,4 +6,4 @@
 #   doc/source/installation.rst
 
 six>=1.3
-numpy>=1.7
+numpy>=1.7.1