diff --git a/.mailmap b/.mailmap
index 59c81dc119..91e14a8077 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,10 +10,13 @@ Alexander Schaefer <alexschaefer83@gmail.com> aschaefer <aschaefer@aschaefer-U36
Alexandre M. Savio <alexsavio@gmail.com> Alexandre M. S <alexsavio@gmail.com>
Alexandre M. Savio <alexsavio@gmail.com> Alexandre M. S <alexsavio@users.noreply.github.com>
Alexandre M. Savio <alexsavio@gmail.com> Alexandre Manhaes Savio <alexsavio@gmail.com>
+Andrew Floren <andrewfloren@gmail.com> afloren <andrewfloren@gmail.com>
Andrey Chetverikov <stop.psy@gmail.com> Andrey Chetverikov <achetverikov@users.noreply.github.com>
Andrey Chetverikov <stop.psy@gmail.com> achetverikov <stop.psy@gmail.com>
+Anibal Sólon Heinsfeld <anibalsolon@gmail.com> anibalsolon <anibalsolon@gmail.com>
Anisha Keshavan <akeshavan@gmail.com> Anisha Keshavan <akeshavan@ucla.edu>
Anisha Keshavan <akeshavan@gmail.com> akeshavan <keshavan@berkeley.edu>
+Ariel Rokem <arokem@berkeley.edu> Ariel Rokem <arokem@gmail.com>
Ariel Rokem <arokem@berkeley.edu> arokem <arokem@berkeley.edu>
Ariel Rokem <arokem@berkeley.edu> arokem <arokem@gmail.com>
Arman Eshaghi <arman.eshaghi@gmail.com> armaneshaghi <arman.eshaghi@gmail.com>
@@ -22,6 +25,7 @@ Ashely Gillman <gillmanash@gmail.com> ashgillman <ashley.gillman@csiro.au>
Basille Pinsard <basile.pinsard@umontreal.ca> bpinsard <basile.pinsard@umontreal.ca>
Basille Pinsard <basile.pinsard@umontreal.ca> bpinsard <bpinsard@imed.jussieu.fr>
Ben Cipollini <bcipollini@classy.org> Ben Cipollini <bcipolli@ucsd.edu>
+Benjamin Acland <benacland@gmail.com> Ben Acland <benacland@gmail.com>
Benjamin Yvernault <byvernault@gmail.com> Benjamin Yvernault <mathieusaboye@MBP-de-Mathieu.fritz.box>
Benjamin Yvernault <byvernault@gmail.com> byvernault <byvernault@gmail.com>
Blake Dewey <blake.dewey@jhu.edu> Blake Dewey <blake.dewey@nih.gov>
@@ -29,19 +33,11 @@ Blake Dewey <blake.dewey@jhu.edu> blakedewey <deweybe@ndsl-nib-bdewey.local>
Blake Dewey <blake.dewey@jhu.edu> blakedewey <deweybe@ndsl-nib-bdewey.ninds.nih.gov>
Brendan Moloney <moloney.brendan@gmail.com> moloney <moloney.brendan@gmail.com>
Caroline Froehlich <carol.frohlich@gmail.com> carolFrohlich <carol.frohlich@gmail.com>
-Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Chris Filo Gorgolewski <filo@filo-Precision-M6500.(none)>
-Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Chris Filo Gorgolewski <krzysztof.gorgolewski+fake@gmail.com>
-Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Chris Filo Gorgolewski <krzysztof.gorgolewski@gmail.com>
-Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Chris Gorgolewski <krzysztof.gorgolewski@gmail.com>
-Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Krzysztof Gorgolewski <krzysztof.gorgolewski@gmail.com>
-Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> filo <filo@filo-Precision-M6500>
-Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> filo <filo@filo-dtc-laptop>
-Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> filo <filo@filolaptop>
Christopher J. Markiewicz <effigies@gmail.com> Chris Markiewicz <effigies@gmail.com>
+Christopher J. Markiewicz <effigies@gmail.com> Chris Markiewicz <markiewicz@stanford.edu>
Christopher J. Markiewicz <effigies@gmail.com> Christopher J. Johnson <effigies@gmail.com>
Christopher J. Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <effigies@bu.edu>
Christopher J. Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <markiewicz@stanford.edu>
-Christopher J. Markiewicz <effigies@gmail.com> Chris Markiewicz <markiewicz@stanford.edu>
Cindee Madison <cindee@berkeley.edu> cindeem
Cindee Madison <cindee@berkeley.edu> cindeem <>
Colin Buchanan <colinrbuchanan@gmail.com> Colin Buchanan <cbuchanan@cray4.(none)>
@@ -54,10 +50,13 @@ Daniel Ginsburg <daniel.ginsburg@childrens.harvard.edu> danginsburg <daniel.gins
Daniel McNamee <dmcx88@gmail.com> danmc <dmcx88@gmail.com>
David Ellis <dgellis90@gmail.com> David Ellis <david-ellis@uiowa.edu>
David Ellis <dgellis90@gmail.com> David Ellis <david.ellis@unmc.edu>
+David Mordom <moreno@cbs.mpg.de> dmordom <moreno@cbs.mpg.de>
David Welch <david.m.welch@gmail.com> David Welch <dmwelch@users.noreply.github.com>
Dimitri Papadopoulos Orfanos <dimitri.papadopoulos@cea.fr> Dimitri Papadopoulos <dimitri.papadopoulos@cea.fr>
Dmytro <belevtsoff@gmail.com> belevtsoff <belevtsoff@gmail.com>
-Dylan Nielson <adenosine@gmail.com> Dylan <Dylan.Nielson@nih.gov>
+Dylan M. Nielson <adenosine@gmail.com> Dylan <Dylan.Nielson@nih.gov>
+Dylan M. Nielson <adenosine@gmail.com> Dylan Nielson <adenosine@gmail.com>
+Eduard Ort <e.ort@vu.nl> eort <e.ort@vu.nl>
Elizabeth DuPre <emd222@cornell.edu> emdupre <emd222@cornell.edu>
Erik Ziegler <erik.sweed@gmail.com> Erik <erik.ziegler@ulg.ac.be>
Erik Ziegler <erik.sweed@gmail.com> Erik Ziegler <erik.ziegler@ulg.ac.be>
@@ -73,6 +72,8 @@ Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux
Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@noramlesup.org>
Gavin Cooper <Gavin.Cooper@newcastle.edu.au> gjcooper <gjcooper@gmail.com>
Gilles de Hollander <gilles.de.hollander@gmail.com> Gilles86 <gilles.de.hollander@gmail.com>
+Gio Piantoni <github@gpiantoni.com> Gio at UMCU <github@gpiantoni.com>
+Guillaume Flandin <guillaume.flandin@gmail.com> Guillaume <guillaume.flandin@gmail.com>
Hans Johnson <hans-johnson@uiowa.edu> Hans Johnson <hans.j.johnson@gmail.com>
Hans Johnson <hans-johnson@uiowa.edu> hjmjohnson <hans.j.johnson@gmail.com>
Horea Christian <horea.christ@yandex.com> Horea Christian <h.chr@mail.ru>
@@ -90,12 +91,16 @@ Jens Kleesiek <kleesiek@uni-heidelberg.de> JensNRAD <kleesiek@uni-heidelberg.de>
Jessica Forbes <jessica-forbes@uiowa.edu> jessicaforbes <jessica-forbes@uiowa.edu>
Jérémy Guillon <jeremy.guillon@inria.fr> GUILLON Jeremy <jeremy.guillon@etu.upmc.fr>
Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> Joerg Stadler <joerg.stadler@lin-magdeburg.de>
+Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> Joerg Stadler <jstadler@ilin-magdeburg.de>
Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> Jörg Stadler <Stadler@lin-magdeburg.de>
+John Lee <johnleenimh@gmail.com> john anthony lee <johnleenimh@gmail.com>
+John Lee <johnleenimh@gmail.com> leej3 <johnleenimh@gmail.com>
Joke Durnez <joke.durnez@gmail.com> jokedurnez <joke.durnez@gmail.com>
Josh Warner <silvertrumpet999+github@gmail.com> JDWarner <warner.joshua@mayo.edu>
Josh Warner <silvertrumpet999+github@gmail.com> Josh Warner (Mac) <warner.joshua@mayo.edu>
-Kai Schlamp <schlamp@gmx.de> medihack <schlamp@gmx.de>Jessica Forbes <jessica-forbes@uiowa.edu> jessicaforbes <jessica-forbes@uiowa.edu>
-Katie Bottenhorn <kbott006@fiu.edu> 62442katieb <kbott006@fiu.edu>
+Kai Schlamp <schlamp@gmx.de> medihack <schlamp@gmx.de>
+Katherine Bottenhorn <kbott006@fiu.edu> 62442katieb <kbott006@fiu.edu>
+Katherine Bottenhorn <kbott006@fiu.edu> Katie Bottenhorn <kbott006@fiu.edu>
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <Kesshi.Jordan@ucsf.edu>
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <kesshi.jordan@gmail.com>
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <kesshijordan@D-108-179-130-38.dhcp4.washington.edu>
@@ -105,6 +110,18 @@ Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi jordan <kjordan@codd.radiology.ucs
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> kesshijordan <Kesshi.Jordan@ucsf.edu>
Kevin Sitek <ksitek@mit.edu> sitek <ksitek@mit.edu>
Kevin Sitek <ksitek@mit.edu> sitek <sitek.kevin@gmail.com>
+Kornelius Podranski <kilo13@web.de> Kornelius <kilo13@web.de>
+Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> Chris Filo Gorgolewski <chris.gorgolewski@gmail.com>
+Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> Chris Filo Gorgolewski <filo@filo-Precision-M6500.(none)>
+Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> Chris Filo Gorgolewski <krzysztof.gorgolewski+fake@gmail.com>
+Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> Chris Filo Gorgolewski <krzysztof.gorgolewski@gmail.com>
+Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> Chris Gorgolewski <krzysztof.gorgolewski@gmail.com>
+Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> Krzysztof Gorgolewski <krzysztof.gorgolewski@gmail.com>
+Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> filo <filo@filo-Precision-M6500>
+Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> filo <filo@filo-Precision-M6500>
+Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> filo <filo@filo-dtc-laptop>
+Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> filo <filo@filolaptop>
+Kshitij Chawla <kc.insight.pi@gmail.com> Kshitij Chawla (kchawla-pi) <kc.insight.pi@gmail.com>
Leonie Lampe <leonie.lampe@gmail.com> Leonie Lmape <leonie.lampe@gmail.com>
Lukas Snoek <lukassnoek@gmail.com> Lukas Snoek <lukassnoek@gmail.com>
Marcel Falkiewicz <mfalkiewicz@gmail.com> Marcel Falkiewicz <m.falkiewicz@nencki.gov.pl>
@@ -113,24 +130,28 @@ Mathias Goncalves <goncalves.mathias@gmail.com> mathiasg <mathiasg@mit.edu>
Mathieu Dubois <mathieu.dubois@icm-institute.org> Mathieu Dubois <mathieu.dubois@cea.fr>
Mathieu Dubois <mathieu.dubois@icm-institute.org> duboism <duboismathieu_gaas@yahoo.fr>
Matteo Mancini <ingmatteomancini@gmail.com> matteomancini <ingmatteomancini@gmail.com>
-Matteo Visconti dOC <matteo.visconti.gr@dartmouth.edu> Matteo Visconti dOC <mvdoc.gr@dartmouth.edu>
-Matteo Visconti dOC <matteo.visconti.gr@dartmouth.edu> mvdoc <matteo.visconti.gr@dartmouth.edu>
+Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu> Matteo Visconti dOC <matteo.visconti.gr@dartmouth.edu>
+Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu> Matteo Visconti dOC <mvdoc.gr@dartmouth.edu>
+Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu> mvdoc <matteo.visconti.gr@dartmouth.edu>
Michael Clark <michael.clark195@gmail.com> Clark <clarkmg@nih.gov>
Michael Dayan <mdayan.research@gmail.com> Michael <mdayan.comp@gmail.com>
Michael Dayan <mdayan.research@gmail.com> Michael <mdayan.research@gmail.com>
Michael Dayan <mdayan.research@gmail.com> mick-d <mid2021@CHUCK.(none)>
-Michael Notter <michaelnotter@hotmail.com> miykael <michaelnotter@hotmail.com>
+Michael Philipp Notter <michaelnotter@hotmail.com> Michael Notter <michaelnotter@hotmail.com>
+Michael Philipp Notter <michaelnotter@hotmail.com> miykael <michaelnotter@hotmail.com>
Michael Waskom <michael.l.waskom@gmail.com> Michael Waskom <mwaskom@mit.edu>
Michael Waskom <michael.l.waskom@gmail.com> Michael Waskom <mwaskom@nyu.edu>
Michael Waskom <michael.l.waskom@gmail.com> Michael Waskom <mwaskom@stanford.edu>
Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@mit.edu>
Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@nyu.edu>
Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@stanford.edu>
+Miguel Molina-Romero <miguel.molina.romero@gmail.com> Miguel Molina <miguel.molina.romero@gmail.com>
Oliver Contier <o.contier@gmail.com> oliver-contier <oliver.contier@ovgu.de>
Oscar Esteban <code@oscaresteban.es> Oscar Esteban <code@oscaresteban>
Oscar Esteban <code@oscaresteban.es> oesteban <code@oscaresteban.es>
Pablo Polosecki <pipolose@us.ibm.com> pipolose <pipolose@pipoloses-MacBook-Air.local>
Pablo Polosecki <pipolose@us.ibm.com> pipolose <pipolose@pipoloses-air.watson.ibm.com>
+Paul Sharp <psharp1289@gmail.com> psharp1289 <psharp1289@gmail.com>
Ranjit Khanuja <ranjit.jhu@gmail.com> RanjitK <ranjit.jhu@gmail.com>
Ross Markello <rossmarkello@gmail.com> Ross Markello <rdm222@cornell.edu>
Russell Poldrack <poldrack@gmail.com> Russ Poldrack <poldrack@gmail.com>
@@ -138,6 +159,7 @@ Russell Poldrack <poldrack@gmail.com> poldrack <poldrack@gmail.com>
Salma Bougacha <salmabougacha@hotmail.com> Salma BOUGACHA <salmabougacha@hotmail.com>
Salma Bougacha <salmabougacha@hotmail.com> salma <salmabougacha@hotmail.com>
Salma Bougacha <salmabougacha@hotmail.com> salma1601 <salmabougacha@hotmail.com>
+Sami Kristian Andberg <sami.andberg@gmail.com> Sami Andberg <sami.andberg@gmail.com>
Satrajit Ghosh <satrajit.ghosh@gmail.com> Satrajit Ghosh <satra@mit.edu>
Sebastian Urchs <sebastian.urchs@gmail.com> sebastian <sebastian.urchs@gmail.com>
Sharad Sikka <ssikka25@gmail.com> ssikka <ssikka25@gmail.com>
@@ -145,7 +167,8 @@ Shariq Iqbal <shariqiqbal2810@gmail.com> shariqiqbal2810 <shariqiqbal2810@gmail.
Shariq Iqbal <shariqiqbal2810@gmail.com> shariqiqbal2810 <shariqiqbal2810@users.noreply.github.com>
Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <nope>
Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <shoshber@users.noreply.github.com>
-Simon R <srothmei@mailbox.tu-berlin.de> Simon Rothmeier <srothmei@users.noreply.github.com>
+Simon Rothmei <srothmei@mailbox.tu-berlin.de> Simon R <srothmei@mailbox.tu-berlin.de>
+Simon Rothmei <srothmei@mailbox.tu-berlin.de> Simon Rothmeier <srothmei@users.noreply.github.com>
Siqi Liu <lsqshr@gmail.com> siqi liu <lsqshr@gmail.com>
Siqi Liu <lsqshr@gmail.com> sql <lsqshr@gmail.com>
Steven Giavasis <sgiava77@gmail.com> Steven Giavasis <steven.giavasis@cmi-rsch-li001.childmind.org>
diff --git a/.zenodo.json b/.zenodo.json
index 4d25cefa52..065e188d8b 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -141,21 +141,26 @@
{
"name": "Berleant, Shoshana"
},
- {
- "affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
- "name": "Horea, Christian",
- "orcid": "0000-0001-7037-2449"
- },
{
"affiliation": "Dartmouth College: Hanover, NH, United States",
"name": "Halchenko, Yaroslav O.",
"orcid": "0000-0003-3456-2493"
},
+ {
+ "affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
+ "name": "Christian, Horea",
+ "orcid": "0000-0001-7037-2449"
+ },
{
"affiliation": "UC San Diego",
"name": "Cipollini, Ben",
"orcid": "0000-0002-7782-0790"
},
+ {
+ "affiliation": "ARAMIS LAB, Brain and Spine Institute (ICM), Paris, France.",
+ "name": "Guillon, Je\u0301re\u0301my",
+ "orcid": "0000-0002-2672-7510"
+ },
{
"affiliation": "Montreal Neurological Institute and Hospital",
"name": "Markello, Ross",
@@ -186,7 +191,7 @@
},
{
"affiliation": "Athena EPI, Inria Sophia-Antipolis",
- "name": "Wassermann , Demian",
+ "name": "Wassermann, Demian",
"orcid": "0000-0001-5194-6056"
},
{
@@ -196,7 +201,7 @@
},
{
"affiliation": "Vrije Universiteit, Amsterdam",
- "name": "Gilles de Hollander",
+ "name": "de Hollander, Gilles",
"orcid": "0000-0003-1988-5091"
},
{
@@ -210,6 +215,11 @@
{
"name": "Buchanan, Colin"
},
+ {
+ "affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences, Leipzig, Germany.",
+ "name": "Tabas, Alejandro",
+ "orcid": "0000-0002-8643-1543"
+ },
{
"name": "Tungaraza, Rosalia"
},
@@ -251,6 +261,10 @@
{
"name": "Dubois, Mathieu"
},
+ {
+ "name": "Heinsfeld, Anibal S\u00f3lon",
+ "orcid": "0000-0002-2050-0614"
+ },
{
"affiliation": "Child Mind Institute",
"name": "Frohlich, Caroline"
@@ -259,6 +273,11 @@
"affiliation": "University of Iowa",
"name": "Welch, David"
},
+ {
+ "affiliation": "Florida International University",
+ "name": "Bottenhorn, Katherine",
+ "orcid": "0000-0002-7796-8795"
+ },
{
"name": "Kent, James"
},
@@ -328,6 +347,11 @@
{
"name": "Ghayoor, Ali"
},
+ {
+ "affiliation": "Otto-von-Guericke-University Magdeburg, Germany",
+ "name": "Contier, Oliver",
+ "orcid": "0000-0002-2983-4709"
+ },
{
"name": "K\u00fcttner, Ren\u00e9"
},
@@ -358,6 +382,11 @@
"affiliation": "The University of Sydney",
"name": "Liu, Siqi"
},
+ {
+ "affiliation": "Leibniz Institute for Neurobiology",
+ "name": "Stadler, J\u00f6rg",
+ "orcid": "0000-0003-4313-129X"
+ },
{
"affiliation": "University of Pennsylvania",
"name": "Kahn, Ari E.",
@@ -377,11 +406,6 @@
"affiliation": "MPI CBS Leipzig, Germany",
"name": "Lampe, Leonie"
},
- {
- "affiliation": "Leibniz Institute for Neurobiology",
- "name": "Stadler, J\u00f6rg",
- "orcid": "0000-0003-4313-129X"
- },
{
"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",
"name": "Kong, Xiang-Zhen",
@@ -410,6 +434,11 @@
"name": "Grignard, Martin",
"orcid": "0000-0001-5549-1861"
},
+ {
+ "affiliation": "INRIA-Saclay, Team Parietal",
+ "name": "Chawla, Kshitij",
+ "orcid": "0000-0002-7517-6321"
+ },
{
"name": "Salvatore, John"
},
@@ -463,11 +492,6 @@
{
"name": "Cheung, Brian"
},
- {
- "affiliation": "The University of Texas at Austin",
- "name": "Floren, Andrew",
- "orcid": "0000-0003-3618-2056"
- },
{
"name": "Urchs, Sebastian"
},
@@ -476,20 +500,30 @@
"name": "Durnez, Joke",
"orcid": "0000-0001-9030-2202"
},
+ {
+ "affiliation": "CNRS, UMS3552 IRMaGe",
+ "name": "Condamine, Eric",
+ "orcid": "0000-0002-9533-3769"
+ },
{
"affiliation": "Technische Universit\u00e4t Dresden, Faculty of Medicine, Department of Child and Adolescent Psychiatry",
"name": "Geisler, Daniel",
"orcid": "0000-0003-2076-5329"
},
{
- "affiliation": "University of illinois urbana champaign",
- "name": "Sharp, Paul"
+ "affiliation": "The University of Texas at Austin",
+ "name": "Floren, Andrew",
+ "orcid": "0000-0003-3618-2056"
},
{
"affiliation": "Institute of Neuroinformatics, ETH/University of Zurich",
"name": "Gerhard, Stephan",
"orcid": "0000-0003-4454-6171"
},
+ {
+ "affiliation": "University of Illinois Urbana Champaign",
+ "name": "Sharp, Paul"
+ },
{
"affiliation": "Technical University Munich",
"name": "Molina-Romero, Miguel",
@@ -540,10 +574,6 @@
{
"name": "Tarbert, Claire"
},
- {
- "affiliation": "Vrije Universiteit Amsterdam",
- "name": "Ort, Eduard"
- },
{
"name": "Nickson, Thomas"
},
@@ -564,6 +594,10 @@
{
"name": "Flandin, Guillaume"
},
+ {
+ "affiliation": "Vrije Universiteit Amsterdam",
+ "name": "Ort, Eduard"
+ },
{
"name": "Shachnev, Dmitry"
},
@@ -600,15 +634,15 @@
{
"name": "McDermottroe, Conor"
},
+ {
+ "affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences, Leipzig, Germany.",
+ "name": "Mihai, Paul Glad",
+ "orcid": "0000-0001-5715-6442"
+ },
{
"affiliation": "MIT, HMS",
"name": "Ghosh, Satrajit",
"orcid": "0000-0002-5312-6729"
- },
- {
- "affiliation": "ARAMIS LAB, Brain and Spine Institute (ICM), Paris, France.",
- "name": "Guillon, Jeremy",
- "orcid": "0000-0002-2672-7510"
}
],
"keywords": [
diff --git a/doc/changelog/1.X.X-changelog b/doc/changelog/1.X.X-changelog
index bfa8c51298..c88c9a9c7b 100644
--- a/doc/changelog/1.X.X-changelog
+++ b/doc/changelog/1.X.X-changelog
@@ -1,3 +1,19 @@
+1.1.9 (February 25, 2019)
+=========================
+
+##### [Full changelog](https://github.com/nipy/nipype/milestone/30?closed=1)
+
+ * FIX: Make positional arguments to LaplacianThickness require previous argument (https://github.com/nipy/nipype/pull/2848)
+ * FIX: Import math and csv modules for bids_gen_info (https://github.com/nipy/nipype/pull/2881)
+ * FIX: Ensure outputs can be listed in camino.ProcStreamlines by defining instance variable (https://github.com/nipy/nipype/pull/2739)
+ * ENH: Allow afni.MaskTool to take multiple input files (https://github.com/nipy/nipype/pull/2892)
+ * ENH: Add flags dictionary input to spm.Level1Design (https://github.com/nipy/nipype/pull/2861)
+ * ENH: Threshold stddev once only in TSNR (https://github.com/nipy/nipype/pull/2883)
+ * ENH: Add workbench.CiftiSmooth interface (https://github.com/nipy/nipype/pull/2871)
+ * DOC: Replace initialism typo in comment with intended phrase (https://github.com/nipy/nipype/pull/2875)
+ * DOC: Fix typos in ANTs Registration input documentation (https://github.com/nipy/nipype/pull/2869)
+
+
1.1.8 (January 28, 2019)
========================
diff --git a/doc/conf.py b/doc/conf.py
index 47b229ac0c..3a45d0338a 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -82,7 +82,7 @@
# The short X.Y version.
version = nipype.__version__
# The full version, including alpha/beta/rc tags.
-release = "1.1.8"
+release = "1.1.9"
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/nipype/info.py b/nipype/info.py
index fcfe81d433..88e2dcd8d8 100644
--- a/nipype/info.py
+++ b/nipype/info.py
@@ -11,7 +11,7 @@
# full release. '.dev' as a version_extra string means this is a development
# version
# Remove -dev for release
-__version__ = '1.1.9-dev'
+__version__ = '1.1.9'
def get_nipype_gitversion():
diff --git a/tools/update_zenodo.py b/tools/update_zenodo.py
new file mode 100755
index 0000000000..637defad49
--- /dev/null
+++ b/tools/update_zenodo.py
@@ -0,0 +1,90 @@
+#!/usr/bin/env python3
+import json
+from fuzzywuzzy import fuzz, process
+import shutil
+import os
+import subprocess as sp
+
+if os.path.exists('line-contributions.txt'):
+ with open('line-contributions.txt', 'rt') as fp:
+ lines = fp.readlines()
+else:
+ if shutil.which('git-line-summary'):
+ print("Running git-line-summary on nipype repo")
+ lines = sp.check_output(['git-line-summary']).decode().split('\n')
+ else:
+ raise RuntimeError("Install Git Extras to view git contributors")
+
+data = [' '.join(line.strip().split()[1:-1]) for line in lines if '%' in line]
+
+# load zenodo from master
+with open('.zenodo.json', 'rt') as fp:
+ zenodo = json.load(fp)
+zen_names = [' '.join(val['name'].split(',')[::-1]).strip()
+ for val in zenodo['creators']]
+
+name_matches = []
+
+for ele in data:
+ matches = process.extract(ele, zen_names, scorer=fuzz.token_sort_ratio,
+ limit=2)
+ # matches is a list [('First match', % Match), ('Second match', % Match)]
+ if matches[0][1] > 80:
+ val = zenodo['creators'][zen_names.index(matches[0][0])]
+ else:
+ # skip unmatched names
+ print("No entry to sort:", ele)
+ continue
+
+ if val not in name_matches:
+ name_matches.append(val)
+
+# for entries not found in line-contributions
+missing_entries = [
+ {"name": "Varada, Jan"},
+ {"name": "Schwabacher, Isaac"},
+ {"affiliation": "Child Mind Institute / Nathan Kline Institute",
+ "name": "Pellman, John",
+ "orcid": "0000-0001-6810-4461"},
+ {"name": "Perez-Guevara, Martin"},
+ {"name": "Khanuja, Ranjeet"},
+ {"affiliation":
+ "Medical Imaging & Biomarkers, Bioclinica, Newark, CA, USA.",
+ "name": "Pannetier, Nicolas",
+ "orcid": "0000-0002-0744-5155"},
+ {"name": "McDermottroe, Conor"},
+ {"affiliation":
+ "Max Planck Institute for Human Cognitive and Brain Sciences, "
+ "Leipzig, Germany.",
+ "name": "Mihai, Paul Glad",
+ "orcid": "0000-0001-5715-6442"},
+]
+
+for entry in missing_entries:
+ name_matches.append(entry)
+
+
+def fix_position(creators):
+ # position first / last authors
+ f_authr = None
+ l_authr = None
+
+ for i, info in enumerate(creators):
+ if info['name'] == 'Gorgolewski, Krzysztof J.':
+ f_authr = i
+ if info['name'] == 'Ghosh, Satrajit':
+ l_authr = i
+
+ if f_authr is None or l_authr is None:
+ raise AttributeError('Missing important people')
+
+ creators.insert(0, creators.pop(f_authr))
+ creators.insert(len(creators), creators.pop(l_authr + 1))
+ return creators
+
+
+zenodo['creators'] = fix_position(name_matches)
+
+with open('.zenodo.json', 'wt') as fp:
+ json.dump(zenodo, fp, indent=2, sort_keys=True)
+ fp.write('\n')