From bba3eeb99cb45956e1044bb9516146ecf89fe1e4 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 22 Feb 2019 11:50:38 -0500 Subject: [PATCH 01/13] DOC: 1.1.9 changelog --- doc/changelog/1.X.X-changelog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/changelog/1.X.X-changelog b/doc/changelog/1.X.X-changelog index bfa8c51298..f72659162d 100644 --- a/doc/changelog/1.X.X-changelog +++ b/doc/changelog/1.X.X-changelog @@ -1,3 +1,17 @@ +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: 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) ======================== From fba0cd7f311c0c039a89e60039af04d7753fc1a6 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 22 Feb 2019 11:51:35 -0500 Subject: [PATCH 02/13] MNT: Version 1.1.9 --- doc/conf.py | 2 +- nipype/info.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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(): From 8cde64a11ff555ef536764224172b57b06b08b8e Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 22 Feb 2019 12:06:08 -0500 Subject: [PATCH 03/13] MNT: Update .mailmap, .zenodo.json --- .mailmap | 5 +++++ .zenodo.json | 34 +++++++++++++++++----------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.mailmap b/.mailmap index 59c81dc119..d58a4ea5ac 100644 --- a/.mailmap +++ b/.mailmap @@ -16,6 +16,7 @@ Anisha Keshavan Anisha Keshavan Anisha Keshavan akeshavan Ariel Rokem arokem Ariel Rokem arokem +Ariel Rokem Ariel Rokem Arman Eshaghi armaneshaghi Ashely Gillman Ashley Gillman Ashely Gillman ashgillman @@ -73,6 +74,7 @@ Gael Varoquaux GaelVaroquaux Gael Varoquaux GaelVaroquaux Gavin Cooper gjcooper Gilles de Hollander Gilles86 +Gio Piantoni Gio at UMCU Hans Johnson Hans Johnson Hans Johnson hjmjohnson Horea Christian Horea Christian @@ -91,6 +93,9 @@ Jessica Forbes jessicaforbes GUILLON Jeremy Joerg Stadler Joerg Stadler Joerg Stadler Jörg Stadler +Joerg Stadler Joerg Stadler +John Lee leej3 +John Lee john anthony lee Joke Durnez jokedurnez Josh Warner JDWarner Josh Warner Josh Warner (Mac) diff --git a/.zenodo.json b/.zenodo.json index 4d25cefa52..3b89fbdc54 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" }, { @@ -358,6 +363,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 +387,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", @@ -604,11 +609,6 @@ "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": [ From a6d1d6e6236122424ebb187a17bf8b6578da1abd Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 22 Feb 2019 14:42:22 -0500 Subject: [PATCH 04/13] MNT: Update mailmap to avoid renames in script --- .mailmap | 51 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/.mailmap b/.mailmap index d58a4ea5ac..4f59dcb7b1 100644 --- a/.mailmap +++ b/.mailmap @@ -10,19 +10,21 @@ Alexander Schaefer aschaefer Alexandre M. S Alexandre M. Savio Alexandre M. S Alexandre M. Savio Alexandre Manhaes Savio +Andrew Floren afloren Andrey Chetverikov Andrey Chetverikov Andrey Chetverikov achetverikov Anisha Keshavan Anisha Keshavan Anisha Keshavan akeshavan +Ariel Rokem Ariel Rokem Ariel Rokem arokem Ariel Rokem arokem -Ariel Rokem Ariel Rokem Arman Eshaghi armaneshaghi Ashely Gillman Ashley Gillman Ashely Gillman ashgillman Basille Pinsard bpinsard Basille Pinsard bpinsard Ben Cipollini Ben Cipollini +Benjamin Acland Ben Acland Benjamin Yvernault Benjamin Yvernault Benjamin Yvernault byvernault Blake Dewey Blake Dewey @@ -30,19 +32,11 @@ Blake Dewey blakedewey Blake Dewey blakedewey Brendan Moloney moloney Caroline Froehlich carolFrohlich -Chris Filo Gorgolewski Chris Filo Gorgolewski -Chris Filo Gorgolewski Chris Filo Gorgolewski -Chris Filo Gorgolewski Chris Filo Gorgolewski -Chris Filo Gorgolewski Chris Gorgolewski -Chris Filo Gorgolewski Krzysztof Gorgolewski -Chris Filo Gorgolewski filo -Chris Filo Gorgolewski filo -Chris Filo Gorgolewski filo Christopher J. Markiewicz Chris Markiewicz +Christopher J. Markiewicz Chris Markiewicz Christopher J. Markiewicz Christopher J. Johnson Christopher J. Markiewicz Christopher J. Markiewicz Christopher J. Markiewicz Christopher J. Markiewicz -Christopher J. Markiewicz Chris Markiewicz Cindee Madison cindeem Cindee Madison cindeem <> Colin Buchanan Colin Buchanan @@ -55,10 +49,13 @@ Daniel Ginsburg danginsburg danmc David Ellis David Ellis David Ellis David Ellis +David Mordom dmordom David Welch David Welch Dimitri Papadopoulos Orfanos Dimitri Papadopoulos Dmytro belevtsoff -Dylan Nielson Dylan +Dylan M. Nielson Dylan +Dylan M. Nielson Dylan Nielson +Eduard Ort eort Elizabeth DuPre emdupre Erik Ziegler Erik Erik Ziegler Erik Ziegler @@ -75,6 +72,7 @@ Gael Varoquaux GaelVaroquaux gjcooper Gilles de Hollander Gilles86 Gio Piantoni Gio at UMCU +Guillaume Flandin Guillaume Hans Johnson Hans Johnson Hans Johnson hjmjohnson Horea Christian Horea Christian @@ -92,14 +90,14 @@ Jens Kleesiek JensNRAD Jessica Forbes jessicaforbes Jérémy Guillon GUILLON Jeremy Joerg Stadler Joerg Stadler -Joerg Stadler Jörg Stadler Joerg Stadler Joerg Stadler -John Lee leej3 +Joerg Stadler Jörg Stadler John Lee john anthony lee +John Lee leej3 Joke Durnez jokedurnez Josh Warner JDWarner Josh Warner Josh Warner (Mac) -Kai Schlamp medihack Jessica Forbes jessicaforbes +Kai Schlamp medihack Katie Bottenhorn 62442katieb Kesshi Jordan Kesshi Jordan Kesshi Jordan Kesshi Jordan @@ -110,6 +108,17 @@ Kesshi Jordan Kesshi jordan kesshijordan Kevin Sitek sitek Kevin Sitek sitek +Kornelius Podranski Kornelius +Krzysztof J. Gorgolewski Chris Filo Gorgolewski +Krzysztof J. Gorgolewski Chris Filo Gorgolewski +Krzysztof J. Gorgolewski Chris Filo Gorgolewski +Krzysztof J. Gorgolewski Chris Filo Gorgolewski +Krzysztof J. Gorgolewski Chris Gorgolewski +Krzysztof J. Gorgolewski Krzysztof Gorgolewski +Krzysztof J. Gorgolewski filo +Krzysztof J. Gorgolewski filo +Krzysztof J. Gorgolewski filo +Krzysztof J. Gorgolewski filo Leonie Lampe Leonie Lmape Lukas Snoek Lukas Snoek Marcel Falkiewicz Marcel Falkiewicz @@ -118,24 +127,28 @@ Mathias Goncalves mathiasg Mathieu Dubois Mathieu Dubois Mathieu Dubois duboism Matteo Mancini matteomancini -Matteo Visconti dOC Matteo Visconti dOC -Matteo Visconti dOC mvdoc +Matteo Visconti di Oleggio Castello Matteo Visconti dOC +Matteo Visconti di Oleggio Castello Matteo Visconti dOC +Matteo Visconti di Oleggio Castello mvdoc Michael Clark Clark Michael Dayan Michael Michael Dayan Michael Michael Dayan mick-d -Michael Notter miykael +Michael Philipp Notter Michael Notter +Michael Philipp Notter miykael Michael Waskom Michael Waskom Michael Waskom Michael Waskom Michael Waskom Michael Waskom Michael Waskom mwaskom Michael Waskom mwaskom Michael Waskom mwaskom +Miguel Molina-Romero Miguel Molina Oliver Contier oliver-contier Oscar Esteban Oscar Esteban Oscar Esteban oesteban Pablo Polosecki pipolose Pablo Polosecki pipolose +Paul Sharp psharp1289 Ranjit Khanuja RanjitK Ross Markello Ross Markello Russell Poldrack Russ Poldrack @@ -143,6 +156,7 @@ Russell Poldrack poldrack Salma Bougacha Salma BOUGACHA Salma Bougacha salma Salma Bougacha salma1601 +Sami Kristian Andberg Sami Andberg Satrajit Ghosh Satrajit Ghosh Sebastian Urchs sebastian Sharad Sikka ssikka @@ -150,7 +164,8 @@ Shariq Iqbal shariqiqbal2810 shariqiqbal2810 Shoshana Berleant Shoshana Berleant Shoshana Berleant Shoshana Berleant -Simon R Simon Rothmeier +Simon Rothmei Simon R +Simon Rothmei Simon Rothmeier Siqi Liu siqi liu Siqi Liu sql Steven Giavasis Steven Giavasis From f079ed286d456b531f4f325ddc689f2572654edd Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 22 Feb 2019 14:54:39 -0500 Subject: [PATCH 05/13] ENH: Add zenodo updating script --- .zenodo.json | 22 +++++------ tools/update_zenodo.py | 85 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 11 deletions(-) create mode 100755 tools/update_zenodo.py diff --git a/.zenodo.json b/.zenodo.json index 3b89fbdc54..7358a2aec2 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -468,11 +468,6 @@ { "name": "Cheung, Brian" }, - { - "affiliation": "The University of Texas at Austin", - "name": "Floren, Andrew", - "orcid": "0000-0003-3618-2056" - }, { "name": "Urchs, Sebastian" }, @@ -487,14 +482,19 @@ "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", @@ -545,10 +545,6 @@ { "name": "Tarbert, Claire" }, - { - "affiliation": "Vrije Universiteit Amsterdam", - "name": "Ort, Eduard" - }, { "name": "Nickson, Thomas" }, @@ -569,6 +565,10 @@ { "name": "Flandin, Guillaume" }, + { + "affiliation": "Vrije Universiteit Amsterdam", + "name": "Ort, Eduard" + }, { "name": "Shachnev, Dmitry" }, diff --git a/tools/update_zenodo.py b/tools/update_zenodo.py new file mode 100755 index 0000000000..185a56965b --- /dev/null +++ b/tools/update_zenodo.py @@ -0,0 +1,85 @@ +#!/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"}, +] + +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') From 298f819e5b6c45cd390c831fdf30fc1656b85b5e Mon Sep 17 00:00:00 2001 From: oliver-contier Date: Sat, 23 Feb 2019 15:54:28 +0100 Subject: [PATCH 06/13] MNT: Add Oliver Contier name to .zenodo.json --- .zenodo.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.zenodo.json b/.zenodo.json index 7358a2aec2..6ed3552b5c 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -609,6 +609,11 @@ "affiliation": "MIT, HMS", "name": "Ghosh, Satrajit", "orcid": "0000-0002-5312-6729" + }, + { + "affiliation": "Otto-von-Guericke-University Magdeburg, Germany", + "name": "Contier, Oliver", + "orcid": "0000-0002-2983-4709" } ], "keywords": [ From 073f6965ef25e0d7d6250486756714918ccfd09c Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Sun, 24 Feb 2019 12:59:25 -0500 Subject: [PATCH 07/13] MNT: Update .zenodo ordering --- .zenodo.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index 6ed3552b5c..6fdd61404b 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -327,6 +327,11 @@ "affiliation": "Child Mind Institute", "name": "Giavasis, Steven" }, + { + "affiliation": "Otto-von-Guericke-University Magdeburg, Germany", + "name": "Contier, Oliver", + "orcid": "0000-0002-2983-4709" + }, { "name": "Correa, Carlos" }, @@ -609,11 +614,6 @@ "affiliation": "MIT, HMS", "name": "Ghosh, Satrajit", "orcid": "0000-0002-5312-6729" - }, - { - "affiliation": "Otto-von-Guericke-University Magdeburg, Germany", - "name": "Contier, Oliver", - "orcid": "0000-0002-2983-4709" } ], "keywords": [ From 2d219a1889a5262bf515290b7293eeb1d1d3bb02 Mon Sep 17 00:00:00 2001 From: qTabs Date: Mon, 25 Feb 2019 12:03:33 +0100 Subject: [PATCH 08/13] Update .zenodo.json --- .zenodo.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.zenodo.json b/.zenodo.json index 6fdd61404b..d9c495e69e 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -614,7 +614,17 @@ "affiliation": "MIT, HMS", "name": "Ghosh, Satrajit", "orcid": "0000-0002-5312-6729" - } + }, + { + "affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences, Leipzig, Germany.", + "name": "Tabas, Alejandro", + "orcid": "0000-0002-8643-1543" + }, + { + "affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences, Leipzig, Germany.", + "name": "Mihai, Paul Glad", + "orcid": "0000-0001-5715-6442" + } ], "keywords": [ "neuroimaging", From e82609eb0b4ca08b1a1debc92393fcc6bcc3bc1e Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Mon, 25 Feb 2019 10:11:46 -0500 Subject: [PATCH 09/13] MNT: Update zenodo ordering --- .zenodo.json | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index d9c495e69e..5d90ac5111 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -212,6 +212,11 @@ "name": "Gillman, Ashley", "orcid": "0000-0001-9130-1092" }, + { + "affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences, Leipzig, Germany.", + "name": "Tabas, Alejandro", + "orcid": "0000-0002-8643-1543" + }, { "name": "Buchanan, Colin" }, @@ -327,17 +332,17 @@ "affiliation": "Child Mind Institute", "name": "Giavasis, Steven" }, - { - "affiliation": "Otto-von-Guericke-University Magdeburg, Germany", - "name": "Contier, Oliver", - "orcid": "0000-0002-2983-4709" - }, { "name": "Correa, Carlos" }, { "name": "Ghayoor, Ali" }, + { + "affiliation": "Otto-von-Guericke-University Magdeburg, Germany", + "name": "Contier, Oliver", + "orcid": "0000-0002-2983-4709" + }, { "name": "K\u00fcttner, Ren\u00e9" }, @@ -614,17 +619,7 @@ "affiliation": "MIT, HMS", "name": "Ghosh, Satrajit", "orcid": "0000-0002-5312-6729" - }, - { - "affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences, Leipzig, Germany.", - "name": "Tabas, Alejandro", - "orcid": "0000-0002-8643-1543" - }, - { - "affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences, Leipzig, Germany.", - "name": "Mihai, Paul Glad", - "orcid": "0000-0001-5715-6442" - } + } ], "keywords": [ "neuroimaging", From 913e68b1c0fe8ab7e024f42eb8ee35d4a09744bb Mon Sep 17 00:00:00 2001 From: anibalsolon Date: Mon, 25 Feb 2019 09:57:15 -0500 Subject: [PATCH 10/13] add to zenodo --- .zenodo.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.zenodo.json b/.zenodo.json index 5d90ac5111..d9160a6201 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -615,6 +615,10 @@ { "name": "McDermottroe, Conor" }, + { + "name": "Heinsfeld, Anibal S\u00f3lon", + "orcid": "0000-0002-2050-0614" + }, { "affiliation": "MIT, HMS", "name": "Ghosh, Satrajit", From 7e86ff4623316661717bd86641dcd6cc0a98093d Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Mon, 25 Feb 2019 10:38:45 -0500 Subject: [PATCH 11/13] MNT: Add kchawla-pi to Zenodo, update mailmap and ordering --- .mailmap | 2 ++ .zenodo.json | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.mailmap b/.mailmap index 4f59dcb7b1..5ed5a7d2f6 100644 --- a/.mailmap +++ b/.mailmap @@ -13,6 +13,7 @@ Alexandre M. Savio Alexandre Manhaes Savio afloren Andrey Chetverikov Andrey Chetverikov Andrey Chetverikov achetverikov +Anibal Sólon Heinsfeld anibalsolon Anisha Keshavan Anisha Keshavan Anisha Keshavan akeshavan Ariel Rokem Ariel Rokem @@ -119,6 +120,7 @@ Krzysztof J. Gorgolewski filo filo Krzysztof J. Gorgolewski filo Krzysztof J. Gorgolewski filo +Kshitij Chawla Kshitij Chawla (kchawla-pi) Leonie Lampe Leonie Lmape Lukas Snoek Lukas Snoek Marcel Falkiewicz Marcel Falkiewicz diff --git a/.zenodo.json b/.zenodo.json index d9160a6201..eaac96b72f 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -212,14 +212,14 @@ "name": "Gillman, Ashley", "orcid": "0000-0001-9130-1092" }, + { + "name": "Buchanan, Colin" + }, { "affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences, Leipzig, Germany.", "name": "Tabas, Alejandro", "orcid": "0000-0002-8643-1543" }, - { - "name": "Buchanan, Colin" - }, { "name": "Tungaraza, Rosalia" }, @@ -261,6 +261,10 @@ { "name": "Dubois, Mathieu" }, + { + "name": "Heinsfeld, Anibal S\u00f3lon", + "orcid": "0000-0002-2050-0614" + }, { "affiliation": "Child Mind Institute", "name": "Frohlich, Caroline" @@ -425,6 +429,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" }, @@ -615,10 +624,6 @@ { "name": "McDermottroe, Conor" }, - { - "name": "Heinsfeld, Anibal S\u00f3lon", - "orcid": "0000-0002-2050-0614" - }, { "affiliation": "MIT, HMS", "name": "Ghosh, Satrajit", From 06ebcfbc2cb573b74aed7d6dace106a7aed47201 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Mon, 25 Feb 2019 12:54:48 -0500 Subject: [PATCH 12/13] MNT: Add Katherine Bottenhorn, Paul Mihai to Zenodo --- .mailmap | 3 ++- .zenodo.json | 15 +++++++++++++++ tools/update_zenodo.py | 5 +++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 5ed5a7d2f6..91e14a8077 100644 --- a/.mailmap +++ b/.mailmap @@ -99,7 +99,8 @@ Joke Durnez jokedurnez Josh Warner JDWarner Josh Warner Josh Warner (Mac) Kai Schlamp medihack -Katie Bottenhorn 62442katieb +Katherine Bottenhorn 62442katieb +Katherine Bottenhorn Katie Bottenhorn Kesshi Jordan Kesshi Jordan Kesshi Jordan Kesshi Jordan Kesshi Jordan Kesshi Jordan diff --git a/.zenodo.json b/.zenodo.json index eaac96b72f..065e188d8b 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -273,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" }, @@ -495,6 +500,11 @@ "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", @@ -624,6 +634,11 @@ { "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", diff --git a/tools/update_zenodo.py b/tools/update_zenodo.py index 185a56965b..637defad49 100755 --- a/tools/update_zenodo.py +++ b/tools/update_zenodo.py @@ -53,6 +53,11 @@ "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: From 5ced29fdf866445eb22992c043df9fde33ccb875 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Mon, 25 Feb 2019 13:54:31 -0500 Subject: [PATCH 13/13] MNT: Update changelog --- doc/changelog/1.X.X-changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/changelog/1.X.X-changelog b/doc/changelog/1.X.X-changelog index f72659162d..c88c9a9c7b 100644 --- a/doc/changelog/1.X.X-changelog +++ b/doc/changelog/1.X.X-changelog @@ -6,6 +6,8 @@ * 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)