From 08b5f0f8c4970e70b16354a550336d424900c2ca Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Thu, 19 Sep 2019 16:29:29 -0400
Subject: [PATCH 1/6] DOC: Update changelog for upcoming 2.5.1 release

---
 Changelog | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/Changelog b/Changelog
index 832e7d0843..fb004c93e3 100644
--- a/Changelog
+++ b/Changelog
@@ -25,6 +25,33 @@ Eric Larson (EL), Demian Wassermann, and Stephan Gerhard.
 
 References like "pr/298" refer to github pull request numbers.
 
+2.5.1 (Monday 23 September 2019)
+================================
+
+Enhancements
+------------
+* Ignore endianness in ``nib-diff`` if values match (pr/799) (YOH, reviewed
+  by CM)
+
+Bug fixes
+---------
+* Correctly handle Philips DICOMs w/ derived volume (pr/795) (Mathias
+  Goncalves, reviewed by CM)
+* Raise CSA tag limit to 1000, parametrize for future relaxing (pr/798,
+  backported to 2.5.x in pr/800) (Henry Braun, reviewed by CM, MB)
+* Coerce data types to match NIfTI intent codes when writing GIFTI data
+  arrays (pr/806) (CM, reported by Tom Holroyd)
+
+Maintenance
+-----------
+* Require h5py 2.10 for Windows + Python < 3.6 to resolve unexpected dtypes
+  in Minc2 data (pr/804) (CM, reviewed by YOH)
+
+API changes and deprecations
+----------------------------
+* Deprecate ``nicom.dicomwrappers.Wrapper.get_affine()`` in favor of ``affine``
+  property; final removal in nibabel 4.0 (pr/796) (YOH, reviewed by CM)
+
 2.5.0 (Sunday 4 August 2019)
 ============================
 

From d8941fc3b1f6057f67aecd6355844f7bda182e94 Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Sun, 15 Sep 2019 10:26:37 -0400
Subject: [PATCH 2/6] MAINT: Version 2.5.1

---
 nibabel/info.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nibabel/info.py b/nibabel/info.py
index 12d0dc9d7e..c45e36c8e6 100644
--- a/nibabel/info.py
+++ b/nibabel/info.py
@@ -19,8 +19,8 @@
 _version_major = 2
 _version_minor = 5
 _version_micro = 1
-_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 bcb4dcc618db5dc0f632e04d71034dc4a281ddc9 Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Sun, 15 Sep 2019 10:28:05 -0400
Subject: [PATCH 3/6] MAINT: Update zenodo.json

---
 .zenodo.json | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.zenodo.json b/.zenodo.json
index 16555380a4..a5ce5075aa 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -87,6 +87,11 @@
     {
       "name": "Moloney, Brendan"
     },
+    {
+      "affiliation": "MIT",
+      "name": "Goncalves, Mathias",
+      "orcid": "0000-0002-7252-7771"
+    },
     {
       "name": "Burns, Christopher"
     },
@@ -130,11 +135,6 @@
     {
       "name": "Baker, Eric M."
     },
-    {
-      "affiliation": "MIT",
-      "name": "Goncalves, Mathias",
-      "orcid": "0000-0002-7252-7771"
-    },
     {
       "name": "Hayashi, Soichi"
     },
@@ -244,6 +244,9 @@
       "name": "P\u00e9rez-Garc\u00eda, Fernando",
       "orcid": "0000-0001-9090-3024"
     },
+    {
+      "name": "Braun, Henry"
+    },
     {
       "name": "Solovey, Igor"
     },

From 28d460ea61560d0f20b3014e1fe03e5e688d80f6 Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Sun, 15 Sep 2019 10:36:20 -0400
Subject: [PATCH 4/6] DOC: Add Henry Braun to contributor list

---
 doc/source/index.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/source/index.rst b/doc/source/index.rst
index ce1db32b86..09f09d4883 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -98,6 +98,7 @@ contributed code and discussion (in rough order of appearance):
 * Matt Cieslak
 * Egor Pafilov
 * Jath Palasubramaniam
+* Henry Braun
 
 License reprise
 ===============

From 1ab44e7298282fcd718007321439725034100131 Mon Sep 17 00:00:00 2001
From: "Christopher J. Markiewicz" <markiewicz@stanford.edu>
Date: Sun, 15 Sep 2019 10:55:59 -0400
Subject: [PATCH 5/6] MAINT: Update setup.cfg nose version to match
 installation instructions

---
 setup.cfg | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 69bd84afe7..08e8727424 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -34,7 +34,8 @@ install_requires =
     numpy >=1.8
     six >=1.3
     bz2file ; python_version < "3.0"
-tests_require = nose
+tests_require =
+    nose >=0.11
 test_suite = nose.collector
 zip_safe = False
 packages = find:
@@ -46,7 +47,7 @@ dicom =
 doc =
     sphinx >=0.3
 test =
-    nose >=0.10.1
+    nose >=0.11
 all =
     %(dicom)s
     %(doc)s

From 248b946b5d956b4b80f84006b26630620084d1cc Mon Sep 17 00:00:00 2001
From: Henry Braun <hbraun@umn.edu>
Date: Thu, 19 Sep 2019 16:23:03 -0500
Subject: [PATCH 6/6] add @hbraunDSP affiliation and ORCID

---
 .zenodo.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.zenodo.json b/.zenodo.json
index a5ce5075aa..9b4621464f 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -245,7 +245,9 @@
       "orcid": "0000-0001-9090-3024"
     },
     {
-      "name": "Braun, Henry"
+      "affiliation": "Center for Magnetic Resonance Research, University of Minnesota",
+      "name": "Braun, Henry",
+      "orcid": "0000-0001-7003-9822"
     },
     {
       "name": "Solovey, Igor"