Skip to content

Commit 30c19e4

Browse files
Merge pull request #515 from effigies/pre_release
MRG: Update authors, changelog Ran through the first few steps of http://nipy.org/nibabel/devel/make_release.html
2 parents 19fd3f8 + 178a2e4 commit 30c19e4

File tree

4 files changed

+48
-2
lines changed

4 files changed

+48
-2
lines changed

.mailmap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,15 @@ Basile Pinsard <basile.pinsard@gmail.com> bpinsard <basile.pinsard@gmail.com>
2828
Basile Pinsard <basile.pinsard@gmail.com> bpinsard <bpinsard@imed.jussieu.fr>
2929
Nguyen, Ly <nguyen60@seattleu.edu> lxn2 <lxn2@uw.edu>
3030
Ben Cipollini <ben.cipollini@gmail.com> Ben Cipollini <bcipolli@ucsd.edu>
31+
Chris Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <markiewicz@stanford.edu>
3132
Chris Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <effigies@bu.edu>
3233
Chris Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <effigies@gmail.com>
3334
Chris Markiewicz <effigies@gmail.com> Chris Johnson <effigies@bu.edu>
3435
Jaakko Leppäkangas <jaeilepp@student.jyu.fi> jaeilepp <jaeilepp@student.jyu.fi>
3536
Ariel Rokem <arokem@gmail.com> arokem <arokem@gmail.com>
3637
Oliver P. Hinds <ohinds@gmail.com> ohinds <ohinds@gmail.com>
3738
Marc-Alexandre Côté <marc.cote.19@gmail.com> Marc-Alexandre Cote <marc.cote.19@gmail.com>
39+
Satrajit Ghosh <satra@mit.edu> Satrajit Ghosh <satrajit.ghosh@gmail.com>
40+
Jasper J.F. van den Bosch <japsai@gmail.com> Jasper <japsai@gmail.com>
41+
Gregory R. Lee <grlee77@gmail.com> Gregory R. Lee <gregory.lee@cchmc.org>
42+
Demian Wassermann <demian@bwh.harvard.edu> Demian Wassermann <demian.wassermann@inria.fr>

Changelog

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,43 @@ Gerhard (SG) and Eric Larson (EL).
2424

2525
References like "pr/298" refer to github pull request numbers.
2626

27+
Upcoming Release
28+
================
29+
30+
New features
31+
------------
32+
33+
* CIFTI support (pr/249) (Satra Ghosh, Michiel Cottaar, BC, CM, Demian
34+
Wassermann, MB)
35+
36+
Enhancements
37+
------------
38+
39+
* Support for alternative header field name variants in .PAR files
40+
(pr/507) (Gregory R. Lee)
41+
* Various enhancements to streamlines API by MC: support for reading TRK
42+
version 1 (pr/512); concatenation of tractograms using `+`/`+=` operators
43+
(pr/495); function to concatenate multiple ArraySequence objects (pr/494)
44+
* Support for numpy 1.12 (pr/500, pr/502) (MC, MB)
45+
* Allow dtype specifiers as fileslice input (pr/485) (MB)
46+
47+
Bug fixes
48+
---------
49+
50+
* Miscellaneous MINC reader fixes (pr/493) (Robert D. Vincent, reviewed by CM,
51+
MB)
52+
53+
Maintenance
54+
-----------
55+
56+
* Documentation update (pr/514) (Ivan Gonzalez)
57+
* Update testing to use pre-release builds of dependencies (pr/509) (MB)
58+
* Better warnings when nibabel not on path (pr/503) (MB)
59+
60+
API changes and deprecations
61+
----------------------------
62+
63+
2764
2.1 (Monday 22 August 2016)
2865
===========================
2966

doc/source/index.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ contributed code and discussion (in rough order of appearance):
7070
* `Ariel Rokem`_
7171
* Eleftherios Garyfallidis
7272
* Jaakko Leppäkangas
73+
* Syam Gadde
74+
* Robert D. Vincent
75+
* Ivan Gonzalez
76+
* Demian Wassermann
7377

7478
License reprise
7579
===============

tools/refresh_readme.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from __future__ import print_function
77

88
import os
9+
import runpy
910

1011
readme_lines = []
1112
with open('README.rst', 'rt') as fobj:
@@ -16,8 +17,7 @@
1617
else:
1718
raise ValueError('Expected comment not found')
1819

19-
rel = {}
20-
execfile(os.path.join('nibabel', 'info.py'), rel)
20+
rel = runpy.run_path(os.path.join('nibabel', 'info.py'))
2121

2222
readme = ''.join(readme_lines) + '\n' + rel['LONG_DESCRIPTION']
2323

0 commit comments

Comments
 (0)