Skip to content

Commit 85f18e9

Browse files
authored
Merge pull request #829 from nipy/rel/3.0.0rc1
REL: 3.0.0rc1
2 parents b773576 + cfa1cb4 commit 85f18e9

File tree

7 files changed

+112
-10
lines changed

7 files changed

+112
-10
lines changed

.mailmap

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Basile Pinsard <[email protected]> bpinsard <[email protected]>
1414
Basile Pinsard <[email protected]> bpinsard <[email protected]>
1515
Ben Cipollini <[email protected]> Ben Cipollini <[email protected]>
1616
Bertrand Thirion <[email protected]> bthirion <[email protected]>
17+
1718
Christian Haselgrove <[email protected]> Christian Haselgrove <[email protected]>
1819
Christopher J. Markiewicz <[email protected]> Chris Johnson <[email protected]>
1920
Christopher J. Markiewicz <[email protected]> Chris Markiewicz <[email protected]>
@@ -40,6 +41,8 @@ Kesshi Jordan <[email protected]> kesshijordan <[email protected]>
4041
Kevin S. Hahn <[email protected]> Kevin S. Hahn <[email protected]>
4142
Konstantinos Raktivan <[email protected]> constracti <[email protected]>
4243
Krish Subramaniam <[email protected]> Krish Subramaniam <[email protected]>
44+
Krzysztof J. Gorgolewski <[email protected]>
45+
Krzysztof J. Gorgolewski <[email protected]> <[email protected]>
4346
Marc-Alexandre Côté <[email protected]> Marc-Alexandre Cote <[email protected]>
4447
Mathias Goncalves <[email protected]> mathiasg <[email protected]>
4548
Matthew Cieslak <[email protected]> Matt Cieslak <[email protected]>
@@ -48,6 +51,7 @@ Michael Hanke <[email protected]> <[email protected]>
4851
Michiel Cottaar <[email protected]> Michiel Cottaar <[email protected]>
4952
5053
Oliver P. Hinds <[email protected]> ohinds <[email protected]>
54+
Oscar Esteban <[email protected]>
5155
Paul McCarthy <[email protected]> Paul McCarthy <[email protected]>
5256
Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
5357
Serge Koudoro <[email protected]> skoudoro <[email protected]>

.zenodo.json

+33-8
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@
6868
"name": "Lee, Gregory R.",
6969
"orcid": "0000-0001-8895-2740"
7070
},
71+
{
72+
"name": "Wang, Hao-Ting",
73+
"orcid": "0000-0003-4078-2038"
74+
},
7175
{
7276
"affiliation": "Harvard University - Psychology",
7377
"name": "Kastman, Erik",
@@ -92,6 +96,11 @@
9296
"name": "Goncalves, Mathias",
9397
"orcid": "0000-0002-7252-7771"
9498
},
99+
{
100+
"affiliation": "Department of Psychology, University of California Davis, CA, USA",
101+
"name": "Riddell, Cameron",
102+
"orcid": "0000-0001-8950-0375"
103+
},
95104
{
96105
"name": "Burns, Christopher"
97106
},
@@ -119,9 +128,24 @@
119128
{
120129
"name": "Vincent, Robert D."
121130
},
131+
{
132+
"affiliation": "Center for Magnetic Resonance Research, University of Minnesota",
133+
"name": "Braun, Henry",
134+
"orcid": "0000-0001-7003-9822"
135+
},
122136
{
123137
"name": "Subramaniam, Krish"
124138
},
139+
{
140+
"affiliation": "MIT",
141+
"name": "Jarecka, Dorota",
142+
"orcid": "0000-0003-1857-8129"
143+
},
144+
{
145+
"affiliation": "Google",
146+
"name": "Gorgolewski, Krzysztof J.",
147+
"orcid": "0000-0003-3321-7583"
148+
},
125149
{
126150
"affiliation": "Rotman Research Institute, Baycrest Health Sciences, Toronto, ON, Canada",
127151
"name": "Raamana, Pradeep Reddy",
@@ -147,6 +171,11 @@
147171
{
148172
"name": "Hymers, Mark"
149173
},
174+
{
175+
"affiliation": "Department of Psychology, Stanford University, CA, USA",
176+
"name": "Esteban, Oscar",
177+
"orcid": "0000-0001-8435-6191"
178+
},
150179
{
151180
"name": "Koudoro, Serge"
152181
},
@@ -170,6 +199,10 @@
170199
{
171200
"name": "St-Jean, Samuel"
172201
},
202+
{
203+
"name": "Panfilov, Egor",
204+
"orcid": "0000-0002-2500-6375"
205+
},
173206
{
174207
"name": "Garyfallidis, Eleftherios"
175208
},
@@ -197,9 +230,6 @@
197230
{
198231
"name": "Fauber, Bennet"
199232
},
200-
{
201-
"name": "Panfilov, Egor"
202-
},
203233
{
204234
"affiliation": "McGill University",
205235
"name": "Poline, Jean-Baptiste",
@@ -244,11 +274,6 @@
244274
"name": "P\u00e9rez-Garc\u00eda, Fernando",
245275
"orcid": "0000-0001-9090-3024"
246276
},
247-
{
248-
"affiliation": "Center for Magnetic Resonance Research, University of Minnesota",
249-
"name": "Braun, Henry",
250-
"orcid": "0000-0001-7003-9822"
251-
},
252277
{
253278
"name": "Solovey, Igor"
254279
},

Changelog

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

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

28+
3.0.0 (To Be Determined)
29+
========================
30+
31+
New features
32+
------------
33+
* ArrayProxy method ``get_scaled()`` scales data with a dtype of a
34+
specified precision, promoting as necessary to avoid overflow. This
35+
is to used in ``img.get_fdata()`` to control memory usage. (pr/833)
36+
(CM, reviewed by Ross Markello)
37+
* GiftiImage method ``agg_data()`` to return usable data arrays (pr/793)
38+
(Hao-Ting Wang, reviewed by CM)
39+
* Accept ``os.PathLike`` objects in place of filenames (pr/610) (Cameron
40+
Riddell, reviewed by MB, CM)
41+
* Function to calculate obliquity of affines (pr/815) (Oscar Esteban,
42+
reviewed by MB)
43+
44+
Enhancements
45+
------------
46+
* ``get_fdata(dtype=np.float32)`` will attempt to avoid casting data to
47+
``np.float64`` when scaling parameters would otherwise promote the data
48+
type unnecessarily. (pr/833) (CM, reviewed by Ross Markello)
49+
* ``ArraySequence`` now supports a large set of Python operators to combine
50+
or update in-place. (pr/811) (MC, reviewed by Serge Koudoro, Philippe Poulin,
51+
CM, MB)
52+
* Warn, rather than fail, on DICOMs with unreadable Siemens CSA tags (pr/818)
53+
(Henry Braun, reviewed by CM)
54+
* Improve clarity of coordinate system tutorial (pr/823) (Egor Panfilov,
55+
reviewed by MB)
56+
57+
Bug fixes
58+
---------
59+
* Sliced ``Tractogram``s no longer ``apply_affine`` to the original
60+
``Tractogram``'s streamlines. (pr/811) (MC, reviewed by Serge Koudoro,
61+
Philippe Poulin, CM, MB)
62+
* Re-import externals/netcdf.py from scipy to resolve numpy deprecation
63+
(pr/821) (CM)
64+
65+
Maintenance
66+
-----------
67+
* Support Python >=3.5.1, including Python 3.8.0 (pr/787) (CM)
68+
* Manage versioning with slightly customized Versioneer (pr/786) (CM)
69+
* Reference Nipy Community Code and Nibabel Developer Guidelines in
70+
GitHub community documents (pr/778) (CM, reviewed by MB)
71+
72+
API changes and deprecations
73+
----------------------------
74+
* Deprecate ``ArraySequence.data`` in favor of ``ArraySequence.get_data()``,
75+
which will return a copy. ``ArraySequence.data`` now returns a read-only
76+
view. (pr/811) (MC, reviewed by Serge Koudoro, Philippe Poulin, CM, MB)
77+
* Deprecate ``DataobjImage.get_data()`` API, to be removed in nibabel 5.0
78+
(pr/794, pr/809) (CM, reviewed by MB)
79+
80+
2881
2.5.1 (Monday 23 September 2019)
2982
================================
3083

doc/source/index.rst

+6-1
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,14 @@ contributed code and discussion (in rough order of appearance):
9696
* Samir Reddigari
9797
* Konstantinos Raktivan
9898
* Matt Cieslak
99-
* Egor Pafilov
99+
* Egor Panfilov
100100
* Jath Palasubramaniam
101101
* Henry Braun
102+
* Oscar Esteban
103+
* Cameron Riddell
104+
* Hao-Ting Wang
105+
* Dorota Jarecka
106+
* Chris Gorgolewski
102107

103108
License reprise
104109
===============

nibabel/_version.py

+5
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
208208
# sorting will prefer e.g. "2.0" over "2.0rc1"
209209
if ref.startswith(tag_prefix):
210210
r = ref[len(tag_prefix):]
211+
# CJM: Nibabel fix to filter out refs that exactly match prefix
212+
# or that don't start with a number once the prefix is stripped
213+
# (Mostly a concern when prefix is '')
214+
if not re.match(r'\d', r):
215+
continue
211216
if verbose:
212217
print("picking %s" % r)
213218
return {"version": r,

nibabel/info.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
_version_major = 3
1414
_version_minor = 0
1515
_version_micro = 0
16-
_version_extra = 'dev'
16+
_version_extra = 'rc1'
1717
# _version_extra = ''
1818

1919
# Format expected by setup.py and doc/source/conf.py: string of form "X.Y.Z"

versioneer.py

+10
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
629629
# sorting will prefer e.g. "2.0" over "2.0rc1"
630630
if ref.startswith(tag_prefix):
631631
r = ref[len(tag_prefix):]
632+
# CJM: Nibabel fix to filter out refs that exactly match prefix
633+
# or that don't start with a number once the prefix is stripped
634+
# (Mostly a concern when prefix is '')
635+
if not re.match(r'\d', r):
636+
continue
632637
if verbose:
633638
print("picking %%s" %% r)
634639
return {"version": r,
@@ -1029,6 +1034,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
10291034
# sorting will prefer e.g. "2.0" over "2.0rc1"
10301035
if ref.startswith(tag_prefix):
10311036
r = ref[len(tag_prefix):]
1037+
# CJM: Nibabel fix to filter out refs that exactly match prefix
1038+
# or that don't start with a number once the prefix is stripped
1039+
# (Mostly a concern when prefix is '')
1040+
if not re.match(r'\d', r):
1041+
continue
10321042
if verbose:
10331043
print("picking %s" % r)
10341044
return {"version": r,

0 commit comments

Comments
 (0)