Skip to content

Commit 5e16865

Browse files
authored
Merge pull request #867 from nipy/rel/3.0.1
REL: 3.0.1
2 parents 442fbf0 + b6df4c6 commit 5e16865

9 files changed

+35
-4
lines changed

.mailmap

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ B. Nolan Nichols <[email protected]> Nolan Nichols <[email protected]
1313
Basile Pinsard <[email protected]> bpinsard <[email protected]>
1414
Basile Pinsard <[email protected]> bpinsard <[email protected]>
1515
Ben Cipollini <[email protected]> Ben Cipollini <[email protected]>
16+
Benjamin C Darwin <[email protected]>
1617
Bertrand Thirion <[email protected]> bthirion <[email protected]>
1718
1819
Christian Haselgrove <[email protected]> Christian Haselgrove <[email protected]>

.zenodo.json

+4
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,10 @@
259259
{
260260
"name": "Schwartz, Yannick"
261261
},
262+
{
263+
"affiliation": "Hospital for Sick Children",
264+
"name": "Darwin, Benjamin C"
265+
},
262266
{
263267
"affiliation": "INRIA",
264268
"name": "Thirion, Bertrand",

Changelog

+18
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,22 @@ Eric Larson (EL), Demian Wassermann, and Stephan Gerhard.
2525

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

28+
3.0.1 (Monday 27 January 2020)
29+
==============================
30+
31+
Bug fixes
32+
---------
33+
* Test failed by using array method on tuple. (pr/860) (Ben Darwin, reviewed by
34+
CM)
35+
* Validate ``ExpiredDeprecationError``\s, promoted by 3.0 release from
36+
``DeprecationWarning``\s. (pr/857) (CM)
37+
38+
Maintenance
39+
-----------
40+
* Remove logic accommodating numpy without float16 types. (pr/866) (CM)
41+
* Accommodate new numpy dtype strings. (pr/858) (CM)
42+
43+
2844
3.0.0 (Wednesday 18 December 2019)
2945
==================================
3046

@@ -66,6 +82,8 @@ Bug fixes
6682
* Sliced ``Tractogram``s no longer ``apply_affine`` to the original
6783
``Tractogram``'s streamlines. (pr/811) (MC, reviewed by Serge Koudoro,
6884
Philippe Poulin, CM, MB)
85+
* Change strings with invalid escapes to raw strings (pr/827) (EL, reviewed
86+
by CM)
6987
* Re-import externals/netcdf.py from scipy to resolve numpy deprecation
7088
(pr/821) (CM)
7189

doc-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
sphinx
44
numpydoc
55
texext
6-
matplotlib>=1.3
6+
matplotlib >=1.3.1

doc/source/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999

100100
# General information about the project.
101101
project = u'NiBabel'
102-
copyright = u'2006-2019, %(maintainer)s <%(author_email)s>' % metadata
102+
copyright = u'2006-2020, %(maintainer)s <%(author_email)s>' % metadata
103103

104104
# The version info for the project you're documenting, acts as replacement for
105105
# |version| and |release|, also used in various other places throughout the

doc/source/index.rst

+1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ contributed code and discussion (in rough order of appearance):
104104
* Hao-Ting Wang
105105
* Dorota Jarecka
106106
* Chris Gorgolewski
107+
* Benjamin C Darwin
107108

108109
License reprise
109110
===============

doc/source/installation.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Requirements
8989
* h5py_ (optional, for MINC2 support)
9090
* PyDICOM_ 0.9.9 or greater (optional, for DICOM support)
9191
* `Python Imaging Library`_ (optional, for PNG conversion in DICOMFS)
92-
* nose_ 0.11 or greater (optional, to run the tests)
92+
* nose_ 0.11 or greater and pytest_ (optional, to run the tests)
9393
* sphinx_ (optional, to build the documentation)
9494

9595
Get the development sources

doc/source/links_names.txt

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
.. _emacs_python_mode: http://www.emacswiki.org/cgi-bin/wiki/PythonMode
8484
.. _doctest-mode: http://ed.loper.org/projects/doctestmode/
8585
.. _nose: http://somethingaboutorange.com/mrl/projects/nose
86+
.. _pytest: https://docs.pytest.org/
8687
.. _`python coverage tester`: http://nedbatchelder.com/code/coverage/
8788
.. _bitbucket: https://bitbucket.org
8889
.. _six: http://pythonhosted.org/six

setup.cfg

+7-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ packages = find:
4141
[options.extras_require]
4242
dicom =
4343
pydicom >=0.9.9
44+
dicomfs =
45+
%(dicom)s
46+
pillow
4447
dev =
4548
gitpython
4649
twine
@@ -51,17 +54,20 @@ doc =
5154
texext
5255
minc2 =
5356
h5py
57+
spm =
58+
scipy
5459
style =
5560
flake8
5661
test =
5762
coverage
5863
nose >=0.11
5964
pytest
6065
all =
61-
%(dicom)s
66+
%(dicomfs)s
6267
%(dev)s
6368
%(doc)s
6469
%(minc2)s
70+
%(spm)s
6571
%(style)s
6672
%(test)s
6773

0 commit comments

Comments
 (0)