Skip to content

Commit 71411b0

Browse files
mgxdmgxd
authored
Merge pull request #3503 from nipy/rel/1.8.4
REL: 1.8.4
2 parents 4a91e88 + e918b2d commit 71411b0

File tree

6 files changed

+62
-23
lines changed

6 files changed

+62
-23
lines changed

‎.mailmap

+15-15
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Alejandro Tabas <[email protected]> <[email protected]>
66
Alejandro de la Vega <[email protected]>
77
Alejandro de la Vega <[email protected]> <[email protected]>
88
Alexander Schaefer <[email protected]>
9-
Alexander Schaefer <[email protected]> <[email protected]>
109
Alexander Schaefer <[email protected]> <aschaefer@aschaefer-U36SD.(none)>
10+
Alexander Schaefer <[email protected]> <[email protected]>
1111
Alexandre M. Savio <[email protected]>
1212
Alexandre M. Savio <[email protected]> <[email protected]>
1313
Andrea Dell'Orco <[email protected]>
@@ -22,9 +22,9 @@ Anna Doll <[email protected]>
2222
Ariel Rokem <[email protected]>
2323
Ariel Rokem <[email protected]> <[email protected]>
2424
Arman Eshaghi <[email protected]>
25+
Ashely Gillman <[email protected]> <[email protected]>
2526
Avneet Kaur <[email protected]>
2627
Avneet Kaur <[email protected]> <[email protected]>
27-
Ashely Gillman <[email protected]> <[email protected]>
2828
Basille Pinsard <[email protected]>
2929
Basille Pinsard <[email protected]> <[email protected]>
3030
Ben Cipollini <[email protected]> <[email protected]>
@@ -39,8 +39,8 @@ Blake Dewey <[email protected]> <[email protected]>
3939
Brendan Moloney <[email protected]>
4040
Caroline Froehlich <[email protected]>
4141
Christopher J. Markiewicz <[email protected]>
42-
Christopher J. Markiewicz <[email protected]> <[email protected]>
4342
Christopher J. Markiewicz <[email protected]> <[email protected]>
43+
Christopher J. Markiewicz <[email protected]> <[email protected]>
4444
Christopher John Steele <[email protected]>
4545
Cindee Madison <[email protected]>
4646
Colin Buchanan <[email protected]>
@@ -49,8 +49,8 @@ Colin Buchanan <[email protected]> <[email protected]>
4949
Daniel Brenner <[email protected]>
5050
Daniel Clark <[email protected]>
5151
Daniel Geisler <[email protected]>
52-
Daniel Geisler <[email protected]> <[email protected]>
5352
Daniel Geisler <[email protected]> <[email protected]>
53+
Daniel Geisler <[email protected]> <[email protected]>
5454
Daniel Ginsburg <[email protected]>
5555
Daniel McNamee <[email protected]>
5656
David Ellis <[email protected]> <[email protected]>
@@ -89,17 +89,17 @@ Hrvoje Stojic <[email protected]>
8989
Isaac Schwabacher <[email protected]>
9090
Jakub Kaczmarzyk <[email protected]>
9191
James Kent <[email protected]>
92-
James Kent <[email protected]> <[email protected]>
9392
James Kent <[email protected]> <[email protected]>
93+
James Kent <[email protected]> <[email protected]>
9494
Janosch Linkersdörfer <[email protected]>
9595
Jason Wong <[email protected]>
9696
Jason Wong <[email protected]> <[email protected]>
9797
Jens Kleesiek <[email protected]>
9898
Jessica Forbes <[email protected]>
9999
Jérémy Guillon <[email protected]> <[email protected]>
100+
Joerg Stadler <[email protected]> <[email protected]>
100101
Joerg Stadler <[email protected]> <[email protected]>
101102
Joerg Stadler <[email protected]> <[email protected]>
102-
Joerg Stadler <[email protected]> <[email protected]>
103103
John A. Lee <[email protected]>
104104
John A. Lee <[email protected]> <[email protected]>
105105
Joke Durnez <[email protected]>
@@ -116,39 +116,37 @@ Kesshi Jordan <[email protected]> <[email protected]
116116
Kesshi Jordan <[email protected]> <[email protected]>
117117
Kevin Sitek <[email protected]>
118118
Kevin Sitek <[email protected]> <[email protected]>
119-
Sin Kim <[email protected]>
120-
Sin Kim <[email protected]> <[email protected]>
121119
Koen Helwegen <[email protected]>
122120
Kornelius Podranski <[email protected]>
123121
Kristofer Montazeri <[email protected]>
124122
Krzysztof J. Gorgolewski <[email protected]>
125123
Krzysztof J. Gorgolewski <[email protected]> <[email protected]>
126124
Krzysztof J. Gorgolewski <[email protected]> <filo@filo-Precision-M6500.(none)>
127-
Krzysztof J. Gorgolewski <[email protected]> <[email protected]>
128125
Krzysztof J. Gorgolewski <[email protected]> <filo@filo-Precision-M6500>
129126
Krzysztof J. Gorgolewski <[email protected]> <filo@filo-dtc-laptop>
130127
Krzysztof J. Gorgolewski <[email protected]> <filo@filolaptop>
128+
Krzysztof J. Gorgolewski <[email protected]> <[email protected]>
131129
Kshitij Chawla <[email protected]>
132130
Leonie Lampe <[email protected]>
133131
Lukas Snoek <[email protected]>
134132
Marcel Falkiewicz <[email protected]> <[email protected]>
135133
Maria de Fatima Dias <[email protected]>
136134
Maria de Fatima Dias <[email protected]> <[email protected]>
137-
Martin Perez-Guevara <[email protected]>
138135
Martin Norgaard <[email protected]>
136+
Martin Perez-Guevara <[email protected]>
139137
Mathias Goncalves <[email protected]> <[email protected]>
140138
Mathias Goncalves <[email protected]> <[email protected]>
141-
Mathieu Dubois <[email protected]> <[email protected]>
142139
Mathieu Dubois <[email protected]> <[email protected]>
140+
Mathieu Dubois <[email protected]> <[email protected]>
143141
Matteo Mancini <[email protected]>
144142
Matteo Visconti di Oleggio Castello <[email protected]>
145143
Matteo Visconti di Oleggio Castello <[email protected]> <[email protected]>
146144
Matthew Cieslak <[email protected]>
147145
Michael Clark <[email protected]> <[email protected]>
148146
Michael Dayan <[email protected]>
149147
Michael Dayan <[email protected]> <[email protected]>
150-
Michael Dayan <[email protected]> mick-d <mid2021@CHUCK.(none)>
151148
Michael Dayan <[email protected]> <[email protected]>
149+
Michael Dayan <[email protected]> mick-d <mid2021@CHUCK.(none)>
152150
Michael Joseph <[email protected]>
153151
Michael Joseph <[email protected]> <[email protected]>
154152
Michael Philipp Notter <[email protected]>
@@ -171,8 +169,8 @@ Paul Kuntke <[email protected]> <[email protected]>
171169
Paul Sharp <[email protected]>
172170
Ranjit Khanuja <[email protected]>
173171
Rastko Ćirić <[email protected]>
174-
Rastko Ćirić <[email protected]> <[email protected]>
175172
Rastko Ćirić <[email protected]> <[email protected]>
173+
Rastko Ćirić <[email protected]> <[email protected]>
176174
Raunak Jalan <[email protected]>
177175
Raunak Jalan <[email protected]> <[email protected]>
178176
Ross Markello <[email protected]> <[email protected]>
@@ -186,15 +184,17 @@ Serge Koudoro <[email protected]>
186184
Sharad Sikka <[email protected]>
187185
Shariq Iqbal <[email protected]>
188186
Shariq Iqbal <[email protected]> <[email protected]>
189-
Shoshana Berleant <[email protected]> Shoshana Berleant <nope>
190187
Shoshana Berleant <[email protected]> <[email protected]>
188+
Shoshana Berleant <[email protected]> Shoshana Berleant <nope>
191189
Shoshana Berleant <[email protected]> Ubuntu <[email protected]>
192190
Simon Rothmei <[email protected]>
193191
Simon Rothmei <[email protected]> <[email protected]>
192+
Sin Kim <[email protected]>
193+
Sin Kim <[email protected]> <[email protected]>
194194
Siqi Liu <[email protected]>
195195
Steven Giavasis <[email protected]>
196-
Steven Giavasis <[email protected]> <[email protected]>
197196
Steven Giavasis <[email protected]> <[email protected]>
197+
Steven Giavasis <[email protected]> <[email protected]>
198198
Steven Tilley <[email protected]> <[email protected]>
199199
Sulantha Mathotaarachchi <[email protected]>
200200
Sunjae Shim <[email protected]>

‎.zenodo.json

+10-6
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,11 @@
318318
"name": "Bernardoni, Fabio",
319319
"orcid": "0000-0002-5112-405X"
320320
},
321+
{
322+
"affiliation": "Sagol School of Neuroscience, Tel Aviv University",
323+
"name": "Ben-Zvi, Gal",
324+
"orcid": "0000-0002-5655-9423"
325+
},
321326
{
322327
"affiliation": "State Key Laboratory of Cognitive Neuroscience and Learning & IDG/McGovern Institute for Brain Research, Beijing Normal University, Beijing, China; Max Planck Institute for Psycholinguistics, Nijmegen, the Netherlands",
323328
"name": "Kong, Xiang-Zhen",
@@ -456,11 +461,6 @@
456461
"affiliation": "University of Iowa",
457462
"name": "Welch, David"
458463
},
459-
{
460-
"affiliation": "Sagol School of Neuroscience, Tel Aviv University",
461-
"name": "Ben-Zvi, Gal",
462-
"orcid": "0000-0002-5655-9423"
463-
},
464464
{
465465
"affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences",
466466
"name": "Contier, Oliver",
@@ -892,7 +892,11 @@
892892
"orcid": "0000-0002-5312-6729"
893893
}
894894
],
895-
"keywords": ["neuroimaging", "workflow", "pipeline"],
895+
"keywords": [
896+
"neuroimaging",
897+
"workflow",
898+
"pipeline"
899+
],
896900
"license": "Apache-2.0",
897901
"upload_type": "software"
898902
}

‎doc/changelog/1.X.X-changelog.rst

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
1.8.4 (September 01, 2022)
2+
==========================
3+
4+
Bug-fix release in the 1.8.x series.
5+
6+
This release sets a maximum traits version to avoid new, breaking changes.
7+
8+
* MNT: Pin traits < 6.4 (https://github.com/nipy/nipype/pull/3501)
9+
* ENH: Add inputs to mrtrix3.DWIPreprocInputSpec and remove mandatory annotation for pe_dir (https://github.com/nipy/nipype/pull/3470)
10+
11+
112
1.8.3 (July 14, 2022)
213
=====================
314

‎nipype/info.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# nipype version information
77
# Remove .dev0 for release
8-
__version__ = "1.8.4.dev0"
8+
__version__ = "1.8.4"
99

1010

1111
def get_nipype_gitversion():
@@ -171,6 +171,7 @@ def get_nipype_gitversion():
171171
"sphinxcontrib-apidoc",
172172
],
173173
"duecredit": ["duecredit"],
174+
"maint": ["GitPython", "fuzzywuzzy"],
174175
"nipy": ["nitime", "nilearn", "dipy", "nipy", "matplotlib"],
175176
"profiler": ["psutil>=5.0"],
176177
"pybids": ["pybids>=0.7.0"],

‎tools/update_changes.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ echo $HEADER >> newchanges
2525
echo $( printf "%${#HEADER}s" | tr " " "=" ) >> newchanges
2626
echo >> newchanges
2727

28-
if [[ "x$2" != "x" ]]; then
28+
MILESTONE=${2:-""}
29+
if [[ "x$MILESTONE" != "x" ]]; then
2930
echo "(\`Full changelog <https://github.com/nipy/nipype/milestone/$2?closed=1>\`__)" >> newchanges
3031
echo >> newchanges
3132
fi

‎tools/update_mailmap.sh

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
3+
# usage -> bash update_mailmap.sh <previous-release>
4+
# by default, will use the latest tag
5+
6+
set -ux
7+
8+
ROOT=$( git rev-parse --show-toplevel )
9+
MAILMAP=$ROOT/.mailmap
10+
11+
LAST=$(git describe --tags `git rev-list --tags --max-count=1`)
12+
RELEASE=${1:-$LAST}
13+
14+
IFS=$'\n'
15+
for NAME in $(git shortlog -nse $RELEASE.. | cut -f2-); do
16+
echo $NAME
17+
done
18+
19+
# sort and write
20+
sort $MAILMAP > .tmpmailmap
21+
cp .tmpmailmap $MAILMAP
22+
rm .tmpmailmap

0 commit comments

Comments
 (0)