From 97a904b8de234de6452c2a0a9b9a241342882197 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 7 Sep 2017 12:09:14 -0400 Subject: [PATCH 1/5] DOC: Update author list --- doc/source/index.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/source/index.rst b/doc/source/index.rst index 9ce39b4254..85c847fb9b 100644 --- a/doc/source/index.rst +++ b/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 =============== From 6a5315bd777093c75f98cba2c90e758f920743c6 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 7 Sep 2017 12:10:11 -0400 Subject: [PATCH 2/5] REL: Update version for final tests --- nibabel/info.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nibabel/info.py b/nibabel/info.py index bf10209ea4..6082fc1fae 100644 --- a/nibabel/info.py +++ b/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, From 9d718173a9841af4f1eec424c72c13265cc41879 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Thu, 7 Sep 2017 12:17:04 -0400 Subject: [PATCH 3/5] DOC: Credit doc fixes --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index c440b9d995..be08646ff9 100644 --- a/Changelog +++ b/Changelog @@ -65,6 +65,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) From a0966351bcab2c7521743ac5f6ddbbec62a0268d Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Tue, 26 Sep 2017 20:12:24 -0400 Subject: [PATCH 4/5] DOC: Update Changelog --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index be08646ff9..62f69a63a6 100644 --- a/Changelog +++ b/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 --------- From 2ca684879a3b78fe767435f5c43d347143a159de Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Tue, 26 Sep 2017 20:37:13 -0400 Subject: [PATCH 5/5] TEST: Use label file that exists across FS versions Update tests with valid checks --- nibabel/freesurfer/tests/test_io.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nibabel/freesurfer/tests/test_io.py b/nibabel/freesurfer/tests/test_io.py index 3d973f2dc1..66673382ac 100644 --- a/nibabel/freesurfer/tests/test_io.py +++ b/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))