Skip to content

Commit 08d7092

Browse files
authored
Merge pull request #2884 from nipy/rel/1.1.9
REL: 1.1.9
2 parents 6071c94 + 5ced29f commit 08d7092

File tree

6 files changed

+209
-46
lines changed

6 files changed

+209
-46
lines changed

.mailmap

+39-16
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ Alexander Schaefer <[email protected]> aschaefer <aschaefer@aschaefer-U36
1010
Alexandre M. Savio <[email protected]> Alexandre M. S <[email protected]>
1111
Alexandre M. Savio <[email protected]> Alexandre M. S <[email protected]>
1212
Alexandre M. Savio <[email protected]> Alexandre Manhaes Savio <[email protected]>
13+
Andrew Floren <[email protected]> afloren <[email protected]>
1314
Andrey Chetverikov <[email protected]> Andrey Chetverikov <[email protected]>
1415
Andrey Chetverikov <[email protected]> achetverikov <[email protected]>
16+
Anibal Sólon Heinsfeld <[email protected]> anibalsolon <[email protected]>
1517
Anisha Keshavan <[email protected]> Anisha Keshavan <[email protected]>
1618
Anisha Keshavan <[email protected]> akeshavan <[email protected]>
19+
Ariel Rokem <[email protected]> Ariel Rokem <[email protected]>
1720
Ariel Rokem <[email protected]> arokem <[email protected]>
1821
Ariel Rokem <[email protected]> arokem <[email protected]>
1922
Arman Eshaghi <[email protected]> armaneshaghi <[email protected]>
@@ -22,26 +25,19 @@ Ashely Gillman <[email protected]> ashgillman <[email protected]>
2225
Basille Pinsard <[email protected]> bpinsard <[email protected]>
2326
Basille Pinsard <[email protected]> bpinsard <[email protected]>
2427
Ben Cipollini <[email protected]> Ben Cipollini <[email protected]>
28+
Benjamin Acland <[email protected]> Ben Acland <[email protected]>
2529
Benjamin Yvernault <[email protected]> Benjamin Yvernault <[email protected]>
2630
Benjamin Yvernault <[email protected]> byvernault <[email protected]>
2731
Blake Dewey <[email protected]> Blake Dewey <[email protected]>
2832
Blake Dewey <[email protected]> blakedewey <[email protected]>
2933
Blake Dewey <[email protected]> blakedewey <[email protected]>
3034
Brendan Moloney <[email protected]> moloney <[email protected]>
3135
Caroline Froehlich <[email protected]> carolFrohlich <[email protected]>
32-
Chris Filo Gorgolewski <[email protected]> Chris Filo Gorgolewski <filo@filo-Precision-M6500.(none)>
33-
Chris Filo Gorgolewski <[email protected]> Chris Filo Gorgolewski <[email protected]>
34-
Chris Filo Gorgolewski <[email protected]> Chris Filo Gorgolewski <[email protected]>
35-
Chris Filo Gorgolewski <[email protected]> Chris Gorgolewski <[email protected]>
36-
Chris Filo Gorgolewski <[email protected]> Krzysztof Gorgolewski <[email protected]>
37-
Chris Filo Gorgolewski <[email protected]> filo <filo@filo-Precision-M6500>
38-
Chris Filo Gorgolewski <[email protected]> filo <filo@filo-dtc-laptop>
39-
Chris Filo Gorgolewski <[email protected]> filo <filo@filolaptop>
4036
Christopher J. Markiewicz <[email protected]> Chris Markiewicz <[email protected]>
37+
Christopher J. Markiewicz <[email protected]> Chris Markiewicz <[email protected]>
4138
Christopher J. Markiewicz <[email protected]> Christopher J. Johnson <[email protected]>
4239
Christopher J. Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
4340
Christopher J. Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
44-
Christopher J. Markiewicz <[email protected]> Chris Markiewicz <[email protected]>
4541
Cindee Madison <[email protected]> cindeem
4642
Cindee Madison <[email protected]> cindeem <>
4743
Colin Buchanan <[email protected]> Colin Buchanan <cbuchanan@cray4.(none)>
@@ -54,10 +50,13 @@ Daniel Ginsburg <[email protected]> danginsburg <daniel.gins
5450
Daniel McNamee <[email protected]> danmc <[email protected]>
5551
David Ellis <[email protected]> David Ellis <[email protected]>
5652
David Ellis <[email protected]> David Ellis <[email protected]>
53+
David Mordom <[email protected]> dmordom <[email protected]>
5754
David Welch <[email protected]> David Welch <[email protected]>
5855
Dimitri Papadopoulos Orfanos <[email protected]> Dimitri Papadopoulos <[email protected]>
5956
60-
Dylan Nielson <[email protected]> Dylan <[email protected]>
57+
Dylan M. Nielson <[email protected]> Dylan <[email protected]>
58+
Dylan M. Nielson <[email protected]> Dylan Nielson <[email protected]>
59+
6160
Elizabeth DuPre <[email protected]> emdupre <[email protected]>
6261
6362
Erik Ziegler <[email protected]> Erik Ziegler <[email protected]>
@@ -73,6 +72,8 @@ Gael Varoquaux <[email protected]> GaelVaroquaux
7372
Gael Varoquaux <[email protected]> GaelVaroquaux <[email protected]>
7473
Gavin Cooper <[email protected]> gjcooper <[email protected]>
7574
Gilles de Hollander <[email protected]> Gilles86 <[email protected]>
75+
Gio Piantoni <[email protected]> Gio at UMCU <[email protected]>
76+
Guillaume Flandin <[email protected]> Guillaume <[email protected]>
7677
Hans Johnson <[email protected]> Hans Johnson <[email protected]>
7778
Hans Johnson <[email protected]> hjmjohnson <[email protected]>
7879
Horea Christian <[email protected]> Horea Christian <[email protected]>
@@ -90,12 +91,16 @@ Jens Kleesiek <[email protected]> JensNRAD <[email protected]>
9091
Jessica Forbes <[email protected]> jessicaforbes <[email protected]>
9192
Jérémy Guillon <[email protected]> GUILLON Jeremy <[email protected]>
9293
Joerg Stadler <[email protected]> Joerg Stadler <[email protected]>
94+
Joerg Stadler <[email protected]> Joerg Stadler <[email protected]>
9395
Joerg Stadler <[email protected]> Jörg Stadler <[email protected]>
96+
John Lee <[email protected]> john anthony lee <[email protected]>
97+
9498
Joke Durnez <[email protected]> jokedurnez <[email protected]>
9599
Josh Warner <[email protected]> JDWarner <[email protected]>
96100
Josh Warner <[email protected]> Josh Warner (Mac) <[email protected]>
97-
Kai Schlamp <[email protected]> medihack <[email protected]>Jessica Forbes <[email protected]> jessicaforbes <[email protected]>
98-
Katie Bottenhorn <[email protected]> 62442katieb <[email protected]>
101+
Kai Schlamp <[email protected]> medihack <[email protected]>
102+
Katherine Bottenhorn <[email protected]> 62442katieb <[email protected]>
103+
Katherine Bottenhorn <[email protected]> Katie Bottenhorn <[email protected]>
99104
Kesshi Jordan <[email protected]> Kesshi Jordan <[email protected]>
100105
Kesshi Jordan <[email protected]> Kesshi Jordan <[email protected]>
101106
Kesshi Jordan <[email protected]> Kesshi Jordan <[email protected]>
@@ -105,6 +110,18 @@ Kesshi Jordan <[email protected]> Kesshi jordan <[email protected]
105110
Kesshi Jordan <[email protected]> kesshijordan <[email protected]>
106111
107112
113+
Kornelius Podranski <[email protected]> Kornelius <[email protected]>
114+
Krzysztof J. Gorgolewski <[email protected]> Chris Filo Gorgolewski <[email protected]>
115+
Krzysztof J. Gorgolewski <[email protected]> Chris Filo Gorgolewski <filo@filo-Precision-M6500.(none)>
116+
Krzysztof J. Gorgolewski <[email protected]> Chris Filo Gorgolewski <[email protected]>
117+
Krzysztof J. Gorgolewski <[email protected]> Chris Filo Gorgolewski <[email protected]>
118+
Krzysztof J. Gorgolewski <[email protected]> Chris Gorgolewski <[email protected]>
119+
Krzysztof J. Gorgolewski <[email protected]> Krzysztof Gorgolewski <[email protected]>
120+
Krzysztof J. Gorgolewski <[email protected]> filo <filo@filo-Precision-M6500>
121+
Krzysztof J. Gorgolewski <[email protected]> filo <filo@filo-Precision-M6500>
122+
Krzysztof J. Gorgolewski <[email protected]> filo <filo@filo-dtc-laptop>
123+
Krzysztof J. Gorgolewski <[email protected]> filo <filo@filolaptop>
124+
Kshitij Chawla <[email protected]> Kshitij Chawla (kchawla-pi) <[email protected]>
108125
Leonie Lampe <[email protected]> Leonie Lmape <[email protected]>
109126
Lukas Snoek <[email protected]> Lukas Snoek <[email protected]>
110127
Marcel Falkiewicz <[email protected]> Marcel Falkiewicz <[email protected]>
@@ -113,39 +130,45 @@ Mathias Goncalves <[email protected]> mathiasg <[email protected]>
113130
Mathieu Dubois <[email protected]> Mathieu Dubois <[email protected]>
114131
Mathieu Dubois <[email protected]> duboism <[email protected]>
115132
Matteo Mancini <[email protected]> matteomancini <[email protected]>
116-
Matteo Visconti dOC <[email protected]> Matteo Visconti dOC <[email protected]>
117-
Matteo Visconti dOC <[email protected]> mvdoc <[email protected]>
133+
Matteo Visconti di Oleggio Castello <[email protected]> Matteo Visconti dOC <[email protected]>
134+
Matteo Visconti di Oleggio Castello <[email protected]> Matteo Visconti dOC <[email protected]>
135+
Matteo Visconti di Oleggio Castello <[email protected]> mvdoc <[email protected]>
118136
Michael Clark <[email protected]> Clark <[email protected]>
119137
Michael Dayan <[email protected]> Michael <[email protected]>
120138
Michael Dayan <[email protected]> Michael <[email protected]>
121139
Michael Dayan <[email protected]> mick-d <mid2021@CHUCK.(none)>
122-
Michael Notter <[email protected]> miykael <[email protected]>
140+
Michael Philipp Notter <[email protected]> Michael Notter <[email protected]>
141+
Michael Philipp Notter <[email protected]> miykael <[email protected]>
123142
Michael Waskom <[email protected]> Michael Waskom <[email protected]>
124143
Michael Waskom <[email protected]> Michael Waskom <[email protected]>
125144
Michael Waskom <[email protected]> Michael Waskom <[email protected]>
126145
Michael Waskom <[email protected]> mwaskom <[email protected]>
127146
Michael Waskom <[email protected]> mwaskom <[email protected]>
128147
Michael Waskom <[email protected]> mwaskom <[email protected]>
148+
Miguel Molina-Romero <[email protected]> Miguel Molina <[email protected]>
129149
Oliver Contier <[email protected]> oliver-contier <[email protected]>
130150
Oscar Esteban <[email protected]> Oscar Esteban <code@oscaresteban>
131151
Oscar Esteban <[email protected]> oesteban <[email protected]>
132152
Pablo Polosecki <[email protected]> pipolose <[email protected]>
133153
Pablo Polosecki <[email protected]> pipolose <[email protected]>
154+
Paul Sharp <[email protected]> psharp1289 <[email protected]>
134155
Ranjit Khanuja <[email protected]> RanjitK <[email protected]>
135156
Ross Markello <[email protected]> Ross Markello <[email protected]>
136157
Russell Poldrack <[email protected]> Russ Poldrack <[email protected]>
137158
Russell Poldrack <[email protected]> poldrack <[email protected]>
138159
Salma Bougacha <[email protected]> Salma BOUGACHA <[email protected]>
139160
Salma Bougacha <[email protected]> salma <[email protected]>
140161
Salma Bougacha <[email protected]> salma1601 <[email protected]>
162+
Sami Kristian Andberg <[email protected]> Sami Andberg <[email protected]>
141163
Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
142164
Sebastian Urchs <[email protected]> sebastian <[email protected]>
143165
Sharad Sikka <[email protected]> ssikka <[email protected]>
144166
Shariq Iqbal <[email protected]> shariqiqbal2810 <[email protected]>
145167
Shariq Iqbal <[email protected]> shariqiqbal2810 <[email protected]>
146168
Shoshana Berleant <[email protected]> Shoshana Berleant <nope>
147169
Shoshana Berleant <[email protected]> Shoshana Berleant <[email protected]>
148-
Simon R <[email protected]> Simon Rothmeier <[email protected]>
170+
Simon Rothmei <[email protected]> Simon R <[email protected]>
171+
Simon Rothmei <[email protected]> Simon Rothmeier <[email protected]>
149172
150173
151174
Steven Giavasis <[email protected]> Steven Giavasis <[email protected]>

.zenodo.json

+62-28
Original file line numberDiff line numberDiff line change
@@ -141,21 +141,26 @@
141141
{
142142
"name": "Berleant, Shoshana"
143143
},
144-
{
145-
"affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
146-
"name": "Horea, Christian",
147-
"orcid": "0000-0001-7037-2449"
148-
},
149144
{
150145
"affiliation": "Dartmouth College: Hanover, NH, United States",
151146
"name": "Halchenko, Yaroslav O.",
152147
"orcid": "0000-0003-3456-2493"
153148
},
149+
{
150+
"affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
151+
"name": "Christian, Horea",
152+
"orcid": "0000-0001-7037-2449"
153+
},
154154
{
155155
"affiliation": "UC San Diego",
156156
"name": "Cipollini, Ben",
157157
"orcid": "0000-0002-7782-0790"
158158
},
159+
{
160+
"affiliation": "ARAMIS LAB, Brain and Spine Institute (ICM), Paris, France.",
161+
"name": "Guillon, Je\u0301re\u0301my",
162+
"orcid": "0000-0002-2672-7510"
163+
},
159164
{
160165
"affiliation": "Montreal Neurological Institute and Hospital",
161166
"name": "Markello, Ross",
@@ -186,7 +191,7 @@
186191
},
187192
{
188193
"affiliation": "Athena EPI, Inria Sophia-Antipolis",
189-
"name": "Wassermann , Demian",
194+
"name": "Wassermann, Demian",
190195
"orcid": "0000-0001-5194-6056"
191196
},
192197
{
@@ -196,7 +201,7 @@
196201
},
197202
{
198203
"affiliation": "Vrije Universiteit, Amsterdam",
199-
"name": "Gilles de Hollander",
204+
"name": "de Hollander, Gilles",
200205
"orcid": "0000-0003-1988-5091"
201206
},
202207
{
@@ -210,6 +215,11 @@
210215
{
211216
"name": "Buchanan, Colin"
212217
},
218+
{
219+
"affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences, Leipzig, Germany.",
220+
"name": "Tabas, Alejandro",
221+
"orcid": "0000-0002-8643-1543"
222+
},
213223
{
214224
"name": "Tungaraza, Rosalia"
215225
},
@@ -251,6 +261,10 @@
251261
{
252262
"name": "Dubois, Mathieu"
253263
},
264+
{
265+
"name": "Heinsfeld, Anibal S\u00f3lon",
266+
"orcid": "0000-0002-2050-0614"
267+
},
254268
{
255269
"affiliation": "Child Mind Institute",
256270
"name": "Frohlich, Caroline"
@@ -259,6 +273,11 @@
259273
"affiliation": "University of Iowa",
260274
"name": "Welch, David"
261275
},
276+
{
277+
"affiliation": "Florida International University",
278+
"name": "Bottenhorn, Katherine",
279+
"orcid": "0000-0002-7796-8795"
280+
},
262281
{
263282
"name": "Kent, James"
264283
},
@@ -328,6 +347,11 @@
328347
{
329348
"name": "Ghayoor, Ali"
330349
},
350+
{
351+
"affiliation": "Otto-von-Guericke-University Magdeburg, Germany",
352+
"name": "Contier, Oliver",
353+
"orcid": "0000-0002-2983-4709"
354+
},
331355
{
332356
"name": "K\u00fcttner, Ren\u00e9"
333357
},
@@ -358,6 +382,11 @@
358382
"affiliation": "The University of Sydney",
359383
"name": "Liu, Siqi"
360384
},
385+
{
386+
"affiliation": "Leibniz Institute for Neurobiology",
387+
"name": "Stadler, J\u00f6rg",
388+
"orcid": "0000-0003-4313-129X"
389+
},
361390
{
362391
"affiliation": "University of Pennsylvania",
363392
"name": "Kahn, Ari E.",
@@ -377,11 +406,6 @@
377406
"affiliation": "MPI CBS Leipzig, Germany",
378407
"name": "Lampe, Leonie"
379408
},
380-
{
381-
"affiliation": "Leibniz Institute for Neurobiology",
382-
"name": "Stadler, J\u00f6rg",
383-
"orcid": "0000-0003-4313-129X"
384-
},
385409
{
386410
"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",
387411
"name": "Kong, Xiang-Zhen",
@@ -410,6 +434,11 @@
410434
"name": "Grignard, Martin",
411435
"orcid": "0000-0001-5549-1861"
412436
},
437+
{
438+
"affiliation": "INRIA-Saclay, Team Parietal",
439+
"name": "Chawla, Kshitij",
440+
"orcid": "0000-0002-7517-6321"
441+
},
413442
{
414443
"name": "Salvatore, John"
415444
},
@@ -463,11 +492,6 @@
463492
{
464493
"name": "Cheung, Brian"
465494
},
466-
{
467-
"affiliation": "The University of Texas at Austin",
468-
"name": "Floren, Andrew",
469-
"orcid": "0000-0003-3618-2056"
470-
},
471495
{
472496
"name": "Urchs, Sebastian"
473497
},
@@ -476,20 +500,30 @@
476500
"name": "Durnez, Joke",
477501
"orcid": "0000-0001-9030-2202"
478502
},
503+
{
504+
"affiliation": "CNRS, UMS3552 IRMaGe",
505+
"name": "Condamine, Eric",
506+
"orcid": "0000-0002-9533-3769"
507+
},
479508
{
480509
"affiliation": "Technische Universit\u00e4t Dresden, Faculty of Medicine, Department of Child and Adolescent Psychiatry",
481510
"name": "Geisler, Daniel",
482511
"orcid": "0000-0003-2076-5329"
483512
},
484513
{
485-
"affiliation": "University of illinois urbana champaign",
486-
"name": "Sharp, Paul"
514+
"affiliation": "The University of Texas at Austin",
515+
"name": "Floren, Andrew",
516+
"orcid": "0000-0003-3618-2056"
487517
},
488518
{
489519
"affiliation": "Institute of Neuroinformatics, ETH/University of Zurich",
490520
"name": "Gerhard, Stephan",
491521
"orcid": "0000-0003-4454-6171"
492522
},
523+
{
524+
"affiliation": "University of Illinois Urbana Champaign",
525+
"name": "Sharp, Paul"
526+
},
493527
{
494528
"affiliation": "Technical University Munich",
495529
"name": "Molina-Romero, Miguel",
@@ -540,10 +574,6 @@
540574
{
541575
"name": "Tarbert, Claire"
542576
},
543-
{
544-
"affiliation": "Vrije Universiteit Amsterdam",
545-
"name": "Ort, Eduard"
546-
},
547577
{
548578
"name": "Nickson, Thomas"
549579
},
@@ -564,6 +594,10 @@
564594
{
565595
"name": "Flandin, Guillaume"
566596
},
597+
{
598+
"affiliation": "Vrije Universiteit Amsterdam",
599+
"name": "Ort, Eduard"
600+
},
567601
{
568602
"name": "Shachnev, Dmitry"
569603
},
@@ -600,15 +634,15 @@
600634
{
601635
"name": "McDermottroe, Conor"
602636
},
637+
{
638+
"affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences, Leipzig, Germany.",
639+
"name": "Mihai, Paul Glad",
640+
"orcid": "0000-0001-5715-6442"
641+
},
603642
{
604643
"affiliation": "MIT, HMS",
605644
"name": "Ghosh, Satrajit",
606645
"orcid": "0000-0002-5312-6729"
607-
},
608-
{
609-
"affiliation": "ARAMIS LAB, Brain and Spine Institute (ICM), Paris, France.",
610-
"name": "Guillon, Jeremy",
611-
"orcid": "0000-0002-2672-7510"
612646
}
613647
],
614648
"keywords": [

doc/changelog/1.X.X-changelog

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
1.1.9 (February 25, 2019)
2+
=========================
3+
4+
##### [Full changelog](https://github.com/nipy/nipype/milestone/30?closed=1)
5+
6+
* FIX: Make positional arguments to LaplacianThickness require previous argument (https://github.com/nipy/nipype/pull/2848)
7+
* FIX: Import math and csv modules for bids_gen_info (https://github.com/nipy/nipype/pull/2881)
8+
* FIX: Ensure outputs can be listed in camino.ProcStreamlines by defining instance variable (https://github.com/nipy/nipype/pull/2739)
9+
* ENH: Allow afni.MaskTool to take multiple input files (https://github.com/nipy/nipype/pull/2892)
10+
* ENH: Add flags dictionary input to spm.Level1Design (https://github.com/nipy/nipype/pull/2861)
11+
* ENH: Threshold stddev once only in TSNR (https://github.com/nipy/nipype/pull/2883)
12+
* ENH: Add workbench.CiftiSmooth interface (https://github.com/nipy/nipype/pull/2871)
13+
* DOC: Replace initialism typo in comment with intended phrase (https://github.com/nipy/nipype/pull/2875)
14+
* DOC: Fix typos in ANTs Registration input documentation (https://github.com/nipy/nipype/pull/2869)
15+
16+
117
1.1.8 (January 28, 2019)
218
========================
319

0 commit comments

Comments
 (0)