Merge pull request #555 from nipy/rel/2.2.0

2.2.0 release prep

Changelog

@@ -53,6 +53,8 @@ Enhancements
 * Improve error handling for ``img.__getitem__`` (pr/533) (Ariel Rokem)
 * Delegate reorientation to SpatialImage classes (pr/544) (Mark Hymers, CM,
   reviewed by MB)
+* Enable using ``indexed_gzip`` to reduce memory usage when reading from
+  gzipped NIfTI and MGH files (pr/552) (Paul McCarthy, reviewed by MB, CM)
 
 Bug fixes
 ---------
@@ -65,6 +67,7 @@ Bug fixes
 Maintenance
 -----------
 
+* Fix documentation errors (pr/517, pr/536) (Fernando Perez, Venky Reddy)
 * Documentation update (pr/514) (Ivan Gonzalez)
 * Update testing to use pre-release builds of dependencies (pr/509) (MB)
 * Better warnings when nibabel not on path (pr/503) (MB)

doc/source/index.rst

@@ -52,7 +52,7 @@ contributed code and discussion (in rough order of appearance):
 * Basile Pinsard
 * `Satrajit Ghosh`_
 * `Nolan Nichols`_
-* Nguyen, Ly
+* Ly Nguyen
 * Philippe Gervais
 * Demian Wassermann
 * Justin Lecher
@@ -78,6 +78,7 @@ contributed code and discussion (in rough order of appearance):
 * Fernando Pérez García
 * Venky Reddy
 * Mark Hymers
+* Jasper J.F. van den Bosch
 
 License reprise
 ===============

nibabel/freesurfer/tests/test_io.py

@@ -212,10 +212,12 @@ def test_annot():
 @freesurfer_test
 def test_label():
     """Test IO of .label"""
-    label_path = pjoin(data_path, "label", "lh.BA1.label")
+    label_path = pjoin(data_path, "label", "lh.cortex.label")
     label = read_label(label_path)
     # XXX : test more
-    assert_true(np.all(label > 0))
+    assert_true(label.min() >= 0)
+    assert_true(label.max() <= 163841)
+    assert_true(label.shape[0] <= 163842)
 
     labels, scalars = read_label(label_path, True)
     assert_true(np.all(labels == label))

nibabel/info.py

@@ -19,8 +19,8 @@
 _version_major = 2
 _version_minor = 2
 _version_micro = 0
-_version_extra = 'dev'
-# _version_extra = ''
+# _version_extra = 'dev'
+_version_extra = ''
 
 # Format expected by setup.py and doc/source/conf.py: string of form "X.Y.Z"
 __version__ = "%s.%s.%s%s" % (_version_major,