Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 71411b0

Browse files
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‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Alejandro Tabas <alextabas@gmail.com> <qtabas@gmail.com>
66
Alejandro de la Vega <aleph4@gmail.com>
77
Alejandro de la Vega <aleph4@gmail.com> <delavega@utexas.edu>
88
Alexander Schaefer <alexschaefer83@gmail.com>
9-
Alexander Schaefer <alexschaefer83@gmail.com> <aschaefer@melisse.cbs.mpg.de>
109
Alexander Schaefer <alexschaefer83@gmail.com> <aschaefer@aschaefer-U36SD.(none)>
10+
Alexander Schaefer <alexschaefer83@gmail.com> <aschaefer@melisse.cbs.mpg.de>
1111
Alexandre M. Savio <alexsavio@gmail.com>
1212
Alexandre M. Savio <alexsavio@gmail.com> <alexsavio@users.noreply.github.com>
1313
Andrea Dell'Orco <orco@paranoici.org>
@@ -22,9 +22,9 @@ Anna Doll <45283972+AnnaD15@users.noreply.github.com>
2222
Ariel Rokem <arokem@berkeley.edu>
2323
Ariel Rokem <arokem@berkeley.edu> <arokem@gmail.com>
2424
Arman Eshaghi <arman.eshaghi@gmail.com>
25+
Ashely Gillman <gillmanash@gmail.com> <ashley.gillman@csiro.au>
2526
Avneet Kaur <avneetkaur@bohr.neurobio.nru.dk>
2627
Avneet Kaur <avneetkaur@bohr.neurobio.nru.dk> <avneet14027@iiitd.ac.in>
27-
Ashely Gillman <gillmanash@gmail.com> <ashley.gillman@csiro.au>
2828
Basille Pinsard <basile.pinsard@umontreal.ca>
2929
Basille Pinsard <basile.pinsard@umontreal.ca> <bpinsard@imed.jussieu.fr>
3030
Ben Cipollini <bcipollini@classy.org> <bcipolli@ucsd.edu>
@@ -39,8 +39,8 @@ Blake Dewey <blake.dewey@jhu.edu> <deweybe@ndsl-nib-bdewey.ninds.nih.gov>
3939
Brendan Moloney <moloney.brendan@gmail.com>
4040
Caroline Froehlich <carol.frohlich@gmail.com>
4141
Christopher J. Markiewicz <effigies@gmail.com>
42-
Christopher J. Markiewicz <effigies@gmail.com> <markiewicz@stanford.edu>
4342
Christopher J. Markiewicz <effigies@gmail.com> <effigies@bu.edu>
43+
Christopher J. Markiewicz <effigies@gmail.com> <markiewicz@stanford.edu>
4444
Christopher John Steele <steelec@gmail.com>
4545
Cindee Madison <cindee@berkeley.edu>
4646
Colin Buchanan <colinrbuchanan@gmail.com>
@@ -49,8 +49,8 @@ Colin Buchanan <colinrbuchanan@gmail.com> <mankind@MacBook.local>
4949
Daniel Brenner <daniel.brenner@me.com>
5050
Daniel Clark <danieljclark87@gmail.com>
5151
Daniel Geisler <daniel.geisler@gmail.com>
52-
Daniel Geisler <daniel.geisler@gmail.com> <daniel.geisler@uniklinikum-dresden.de>
5352
Daniel Geisler <daniel.geisler@gmail.com> <3453485+daniel-ge@users.noreply.github.com>
53+
Daniel Geisler <daniel.geisler@gmail.com> <daniel.geisler@uniklinikum-dresden.de>
5454
Daniel Ginsburg <daniel.ginsburg@childrens.harvard.edu>
5555
Daniel McNamee <dmcx88@gmail.com>
5656
David Ellis <dgellis90@gmail.com> <david-ellis@uiowa.edu>
@@ -89,17 +89,17 @@ Hrvoje Stojic <hrvoje.stojic@protonmail.com>
8989
Isaac Schwabacher <ischwabacher@wisc.edu>
9090
Jakub Kaczmarzyk <jakubk@mit.edu>
9191
James Kent <james-kent@uiowa.edu>
92-
James Kent <james-kent@uiowa.edu> <mertzf@bargle.argle>
9392
James Kent <james-kent@uiowa.edu> <jamesdkent21@gmail.com>
93+
James Kent <james-kent@uiowa.edu> <mertzf@bargle.argle>
9494
Janosch Linkersdörfer <linkersdoerfer@gmail.com>
9595
Jason Wong <jf126dolphin@gmail.com>
9696
Jason Wong <jf126dolphin@gmail.com> <jasonwong73@ucla.edu>
9797
Jens Kleesiek <kleesiek@uni-heidelberg.de>
9898
Jessica Forbes <jessica-forbes@uiowa.edu>
9999
Jérémy Guillon <jeremy.guillon@inria.fr> <jeremy.guillon@etu.upmc.fr>
100+
Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <Stadler@lin-magdeburg.de>
100101
Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <joerg.stadler@lin-magdeburg.de>
101102
Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <jstadler@ilin-magdeburg.de>
102-
Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <Stadler@lin-magdeburg.de>
103103
John A. Lee <johnleenimh@gmail.com>
104104
John A. Lee <johnleenimh@gmail.com> <leej3@users.noreply.github.com>
105105
Joke Durnez <joke.durnez@gmail.com>
@@ -116,39 +116,37 @@ Kesshi Jordan <Kesshi.Jordan@ucsf.edu> <kesshijordan@iPhone-010060104098.ucsf.ed
116116
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> <kjordan@codd.radiology.ucsf.edu>
117117
Kevin Sitek <ksitek@mit.edu>
118118
Kevin Sitek <ksitek@mit.edu> <sitek.kevin@gmail.com>
119-
Sin Kim <kimsin98@gmail.com>
120-
Sin Kim <kimsin98@gmail.com> <AKSoo@users.noreply.github.com>
121119
Koen Helwegen <kg.helwegen@gmail.com>
122120
Kornelius Podranski <kilo13@web.de>
123121
Kristofer Montazeri <kristofer.montazeri@gmail.com>
124122
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com>
125123
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <chris.gorgolewski@gmail.com>
126124
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filo-Precision-M6500.(none)>
127-
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <krzysztof.gorgolewski+fake@gmail.com>
128125
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filo-Precision-M6500>
129126
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filo-dtc-laptop>
130127
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filolaptop>
128+
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <krzysztof.gorgolewski+fake@gmail.com>
131129
Kshitij Chawla <kc.insight.pi@gmail.com>
132130
Leonie Lampe <leonie.lampe@gmail.com>
133131
Lukas Snoek <lukassnoek@gmail.com>
134132
Marcel Falkiewicz <mfalkiewicz@gmail.com> <m.falkiewicz@nencki.gov.pl>
135133
Maria de Fatima Dias <mfatimamachado13@gmail.com>
136134
Maria de Fatima Dias <mfatimamachado13@gmail.com> <fmachado@dei.uc.pt>
137-
Martin Perez-Guevara <mperezguevara@gmail.com>
138135
Martin Norgaard <martin.noergaard@nru.dk>
136+
Martin Perez-Guevara <mperezguevara@gmail.com>
139137
Mathias Goncalves <goncalves.mathias@gmail.com> <mathiasg@mit.edu>
140138
Mathias Goncalves <goncalves.mathias@gmail.com> <mathiasg@stanford.edu>
141-
Mathieu Dubois <mathieu.dubois@icm-institute.org> <mathieu.dubois@cea.fr>
142139
Mathieu Dubois <mathieu.dubois@icm-institute.org> <duboismathieu_gaas@yahoo.fr>
140+
Mathieu Dubois <mathieu.dubois@icm-institute.org> <mathieu.dubois@cea.fr>
143141
Matteo Mancini <ingmatteomancini@gmail.com>
144142
Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu>
145143
Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu> <mvdoc.gr@dartmouth.edu>
146144
Matthew Cieslak <mattcieslak@gmail.com>
147145
Michael Clark <michael.clark195@gmail.com> <clarkmg@nih.gov>
148146
Michael Dayan <mdayan.research@gmail.com>
149147
Michael Dayan <mdayan.research@gmail.com> <mdayan.comp@gmail.com>
150-
Michael Dayan <mdayan.research@gmail.com> mick-d <mid2021@CHUCK.(none)>
151148
Michael Dayan <mdayan.research@gmail.com> <michael@mail.example.com>
149+
Michael Dayan <mdayan.research@gmail.com> mick-d <mid2021@CHUCK.(none)>
152150
Michael Joseph <josephmje.22@gmail.com>
153151
Michael Joseph <josephmje.22@gmail.com> <mjoseph@scclogin02.camhres.ca>
154152
Michael Philipp Notter <michaelnotter@hotmail.com>
@@ -171,8 +169,8 @@ Paul Kuntke <paul@42degreesoffreedom.com> <paul@kuntke.de>
171169
Paul Sharp <psharp1289@gmail.com>
172170
Ranjit Khanuja <ranjit.jhu@gmail.com>
173171
Rastko Ćirić <rc042010@mymail.pomona.edu>
174-
Rastko Ćirić <rc042010@mymail.pomona.edu> <rciric@users.noreply.github.com>
175172
Rastko Ćirić <rc042010@mymail.pomona.edu> <rastko@stanford.edu>
173+
Rastko Ćirić <rc042010@mymail.pomona.edu> <rciric@users.noreply.github.com>
176174
Raunak Jalan <ronakjalan98@gmail.com>
177175
Raunak Jalan <ronakjalan98@gmail.com> <41023976+RaunakJalan@users.noreply.github.com>
178176
Ross Markello <rossmarkello@gmail.com> <rdm222@cornell.edu>
@@ -186,15 +184,17 @@ Serge Koudoro <skab12@gmail.com>
186184
Sharad Sikka <ssikka25@gmail.com>
187185
Shariq Iqbal <shariqiqbal2810@gmail.com>
188186
Shariq Iqbal <shariqiqbal2810@gmail.com> <shariqiqbal2810@users.noreply.github.com>
189-
Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <nope>
190187
Shoshana Berleant <berleant@stanford.edu> <shoshber@users.noreply.github.com>
188+
Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <nope>
191189
Shoshana Berleant <berleant@stanford.edu> Ubuntu <ubuntu@ip-172-31-43-202.us-west-2.compute.internal>
192190
Simon Rothmei <srothmei@mailbox.tu-berlin.de>
193191
Simon Rothmei <srothmei@mailbox.tu-berlin.de> <srothmei@users.noreply.github.com>
192+
Sin Kim <kimsin98@gmail.com>
193+
Sin Kim <kimsin98@gmail.com> <AKSoo@users.noreply.github.com>
194194
Siqi Liu <lsqshr@gmail.com>
195195
Steven Giavasis <sgiava77@gmail.com>
196-
Steven Giavasis <sgiava77@gmail.com> <steven.giavasis@cmi-rsch-li001.childmind.org>
197196
Steven Giavasis <sgiava77@gmail.com> <sgiavasis@ieee.org>
197+
Steven Giavasis <sgiava77@gmail.com> <steven.giavasis@cmi-rsch-li001.childmind.org>
198198
Steven Tilley <stilley@hollandbloorview.ca> <steve@steventilley.com>
199199
Sulantha Mathotaarachchi <sulantha.s@gmail.com>
200200
Sunjae Shim <85246533+sjshim@users.noreply.github.com>

‎.zenodo.json‎

Lines changed: 10 additions & 6 deletions
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‎

Lines changed: 11 additions & 0 deletions
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‎

Lines changed: 2 additions & 1 deletion
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‎

Lines changed: 2 additions & 1 deletion
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 [[ "x2ドル" != "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‎

Lines changed: 22 additions & 0 deletions
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)

AltStyle によって変換されたページ (->オリジナル) /