Skip to content

Commit 422c04c

Browse files
rciricrciric
committed
Merge branch 'master' of https://github.com/nipy/nipype 
2 parents 27ed03f + 232ac23 commit 422c04c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1503
-215
lines changed

‎.mailmap‎

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,20 @@ Aimi Watanabe <watanabe.aimi@gmail.com> stymy <watanabe.aimi@gmail.com>
33
Alejandro Tabas <alextabas@gmail.com> qTabs <qtabas@gmail.com>
44
Alejandro Tabas <alextabas@gmail.com> qtabs <alextabas@gmail.com>
55
Alejandro de la Vega <aleph4@gmail.com> adelavega <delavega@utexas.edu>
6+
Alejandro de la Vega <aleph4@gmail.com> delavega4 <aleph4@gmail.com>
67
Alexander Schaefer <alexschaefer83@gmail.com> Alexander Schaefer <aschaefer@melisse.cbs.mpg.de>
78
Alexander Schaefer <alexschaefer83@gmail.com> alexschaefer83 <alexschaefer83@gmail.com>
89
Alexander Schaefer <alexschaefer83@gmail.com> aschaefer <aschaefer@aschaefer-U36SD.(none)>
910
Alexandre M. Savio <alexsavio@gmail.com> Alexandre M. S <alexsavio@gmail.com>
1011
Alexandre M. Savio <alexsavio@gmail.com> Alexandre M. S <alexsavio@users.noreply.github.com>
1112
Alexandre M. Savio <alexsavio@gmail.com> Alexandre Manhaes Savio <alexsavio@gmail.com>
13+
Andrew Floren <andrewfloren@gmail.com> afloren <andrewfloren@gmail.com>
1214
Andrey Chetverikov <stop.psy@gmail.com> Andrey Chetverikov <achetverikov@users.noreply.github.com>
1315
Andrey Chetverikov <stop.psy@gmail.com> achetverikov <stop.psy@gmail.com>
16+
Anibal Sólon Heinsfeld <anibalsolon@gmail.com> anibalsolon <anibalsolon@gmail.com>
1417
Anisha Keshavan <akeshavan@gmail.com> Anisha Keshavan <akeshavan@ucla.edu>
1518
Anisha Keshavan <akeshavan@gmail.com> akeshavan <keshavan@berkeley.edu>
19+
Ariel Rokem <arokem@berkeley.edu> Ariel Rokem <arokem@gmail.com>
1620
Ariel Rokem <arokem@berkeley.edu> arokem <arokem@berkeley.edu>
1721
Ariel Rokem <arokem@berkeley.edu> arokem <arokem@gmail.com>
1822
Arman Eshaghi <arman.eshaghi@gmail.com> armaneshaghi <arman.eshaghi@gmail.com>
@@ -21,22 +25,16 @@ Ashely Gillman <gillmanash@gmail.com> ashgillman <ashley.gillman@csiro.au>
2125
Basille Pinsard <basile.pinsard@umontreal.ca> bpinsard <basile.pinsard@umontreal.ca>
2226
Basille Pinsard <basile.pinsard@umontreal.ca> bpinsard <bpinsard@imed.jussieu.fr>
2327
Ben Cipollini <bcipollini@classy.org> Ben Cipollini <bcipolli@ucsd.edu>
28+
Benjamin Acland <benacland@gmail.com> Ben Acland <benacland@gmail.com>
2429
Benjamin Yvernault <byvernault@gmail.com> Benjamin Yvernault <mathieusaboye@MBP-de-Mathieu.fritz.box>
2530
Benjamin Yvernault <byvernault@gmail.com> byvernault <byvernault@gmail.com>
2631
Blake Dewey <blake.dewey@jhu.edu> Blake Dewey <blake.dewey@nih.gov>
2732
Blake Dewey <blake.dewey@jhu.edu> blakedewey <deweybe@ndsl-nib-bdewey.local>
2833
Blake Dewey <blake.dewey@jhu.edu> blakedewey <deweybe@ndsl-nib-bdewey.ninds.nih.gov>
2934
Brendan Moloney <moloney.brendan@gmail.com> moloney <moloney.brendan@gmail.com>
3035
Caroline Froehlich <carol.frohlich@gmail.com> carolFrohlich <carol.frohlich@gmail.com>
31-
Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Chris Filo Gorgolewski <filo@filo-Precision-M6500.(none)>
32-
Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Chris Filo Gorgolewski <krzysztof.gorgolewski+fake@gmail.com>
33-
Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Chris Filo Gorgolewski <krzysztof.gorgolewski@gmail.com>
34-
Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Chris Gorgolewski <krzysztof.gorgolewski@gmail.com>
35-
Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Krzysztof Gorgolewski <krzysztof.gorgolewski@gmail.com>
36-
Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> filo <filo@filo-Precision-M6500>
37-
Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> filo <filo@filo-dtc-laptop>
38-
Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> filo <filo@filolaptop>
3936
Christopher J. Markiewicz <effigies@gmail.com> Chris Markiewicz <effigies@gmail.com>
37+
Christopher J. Markiewicz <effigies@gmail.com> Chris Markiewicz <markiewicz@stanford.edu>
4038
Christopher J. Markiewicz <effigies@gmail.com> Christopher J. Johnson <effigies@gmail.com>
4139
Christopher J. Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <effigies@bu.edu>
4240
Christopher J. Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <markiewicz@stanford.edu>
@@ -52,16 +50,20 @@ Daniel Ginsburg <daniel.ginsburg@childrens.harvard.edu> danginsburg <daniel.gins
5250
Daniel McNamee <dmcx88@gmail.com> danmc <dmcx88@gmail.com>
5351
David Ellis <dgellis90@gmail.com> David Ellis <david-ellis@uiowa.edu>
5452
David Ellis <dgellis90@gmail.com> David Ellis <david.ellis@unmc.edu>
53+
David Mordom <moreno@cbs.mpg.de> dmordom <moreno@cbs.mpg.de>
5554
David Welch <david.m.welch@gmail.com> David Welch <dmwelch@users.noreply.github.com>
5655
Dimitri Papadopoulos Orfanos <dimitri.papadopoulos@cea.fr> Dimitri Papadopoulos <dimitri.papadopoulos@cea.fr>
5756
Dmytro <belevtsoff@gmail.com> belevtsoff <belevtsoff@gmail.com>
58-
Dylan Nielson <adenosine@gmail.com> Dylan <Dylan.Nielson@nih.gov>
57+
Dylan M. Nielson <adenosine@gmail.com> Dylan <Dylan.Nielson@nih.gov>
58+
Dylan M. Nielson <adenosine@gmail.com> Dylan Nielson <adenosine@gmail.com>
59+
Eduard Ort <e.ort@vu.nl> eort <e.ort@vu.nl>
5960
Elizabeth DuPre <emd222@cornell.edu> emdupre <emd222@cornell.edu>
6061
Erik Ziegler <erik.sweed@gmail.com> Erik <erik.ziegler@ulg.ac.be>
6162
Erik Ziegler <erik.sweed@gmail.com> Erik Ziegler <erik.ziegler@ulg.ac.be>
6263
Erik Ziegler <erik.sweed@gmail.com> erik <erik@erik-ubuntu.(none)>
6364
Erik Ziegler <erik.sweed@gmail.com> erikz <erik.ziegler@ulg.ac.be>
6465
Erik Ziegler <erik.sweed@gmail.com> swederik <erik.sweed@gmail.com>
66+
Feilong Ma <mafeilong@gmail.com> Ma Feilong <mafeilong@gmail.com>
6567
Fernando Pérez-García <fepegar@gmail.com> Fernando <fepegar@gmail.com>
6668
Franz Liem <franz.liem@gmail.com> fliem <franz.liem>
6769
Franz Liem <franz.liem@gmail.com> fliem <franz.liem@gmail.com>
@@ -70,6 +72,8 @@ Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux
7072
Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@noramlesup.org>
7173
Gavin Cooper <Gavin.Cooper@newcastle.edu.au> gjcooper <gjcooper@gmail.com>
7274
Gilles de Hollander <gilles.de.hollander@gmail.com> Gilles86 <gilles.de.hollander@gmail.com>
75+
Gio Piantoni <github@gpiantoni.com> Gio at UMCU <github@gpiantoni.com>
76+
Guillaume Flandin <guillaume.flandin@gmail.com> Guillaume <guillaume.flandin@gmail.com>
7377
Hans Johnson <hans-johnson@uiowa.edu> Hans Johnson <hans.j.johnson@gmail.com>
7478
Hans Johnson <hans-johnson@uiowa.edu> hjmjohnson <hans.j.johnson@gmail.com>
7579
Horea Christian <horea.christ@yandex.com> Horea Christian <h.chr@mail.ru>
@@ -87,13 +91,17 @@ Jens Kleesiek <kleesiek@uni-heidelberg.de> JensNRAD <kleesiek@uni-heidelberg.de>
8791
Jessica Forbes <jessica-forbes@uiowa.edu> jessicaforbes <jessica-forbes@uiowa.edu>
8892
Jérémy Guillon <jeremy.guillon@inria.fr> GUILLON Jeremy <jeremy.guillon@etu.upmc.fr>
8993
Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> Joerg Stadler <joerg.stadler@lin-magdeburg.de>
94+
Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> Joerg Stadler <jstadler@ilin-magdeburg.de>
9095
Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> Jörg Stadler <Stadler@lin-magdeburg.de>
96+
John Lee <johnleenimh@gmail.com> john anthony lee <johnleenimh@gmail.com>
97+
John Lee <johnleenimh@gmail.com> leej3 <johnleenimh@gmail.com>
9198
Joke Durnez <joke.durnez@gmail.com> jokedurnez <joke.durnez@gmail.com>
9299
Josh Warner <silvertrumpet999+github@gmail.com> JDWarner <warner.joshua@mayo.edu>
93100
Josh Warner <silvertrumpet999+github@gmail.com> Josh Warner (Mac) <warner.joshua@mayo.edu>
94-
Kai Schlamp <schlamp@gmx.de> medihack <schlamp@gmx.de>Jessica Forbes <jessica-forbes@uiowa.edu> jessicaforbes <jessica-forbes@uiowa.edu>
95-
Katie Bottenhorn <kbott006@fiu.edu> 62442katieb <kbott006@fiu.edu>
96-
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <Kesshi.Jordan@ucsf.edu>
101+
Kai Schlamp <schlamp@gmx.de> medihack <schlamp@gmx.de>
102+
Katherine Bottenhorn <kbott006@fiu.edu> 62442katieb <kbott006@fiu.edu>
103+
Katherine Bottenhorn <kbott006@fiu.edu> Katie Bottenhorn <kbott006@fiu.edu>
104+
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <Kesshi.Jordan@ucsf.edu>
97105
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <kesshi.jordan@gmail.com>
98106
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <kesshijordan@D-108-179-130-38.dhcp4.washington.edu>
99107
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <kesshijordan@D-69-91-152-99.dhcp4.washington.edu>
@@ -102,6 +110,18 @@ Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi jordan <kjordan@codd.radiology.ucs
102110
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> kesshijordan <Kesshi.Jordan@ucsf.edu>
103111
Kevin Sitek <ksitek@mit.edu> sitek <ksitek@mit.edu>
104112
Kevin Sitek <ksitek@mit.edu> sitek <sitek.kevin@gmail.com>
113+
Kornelius Podranski <kilo13@web.de> Kornelius <kilo13@web.de>
114+
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> Chris Filo Gorgolewski <chris.gorgolewski@gmail.com>
115+
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> Chris Filo Gorgolewski <filo@filo-Precision-M6500.(none)>
116+
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> Chris Filo Gorgolewski <krzysztof.gorgolewski+fake@gmail.com>
117+
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> Chris Filo Gorgolewski <krzysztof.gorgolewski@gmail.com>
118+
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> Chris Gorgolewski <krzysztof.gorgolewski@gmail.com>
119+
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> Krzysztof Gorgolewski <krzysztof.gorgolewski@gmail.com>
120+
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> filo <filo@filo-Precision-M6500>
121+
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> filo <filo@filo-Precision-M6500>
122+
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> filo <filo@filo-dtc-laptop>
123+
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> filo <filo@filolaptop>
124+
Kshitij Chawla <kc.insight.pi@gmail.com> Kshitij Chawla (kchawla-pi) <kc.insight.pi@gmail.com>
105125
Leonie Lampe <leonie.lampe@gmail.com> Leonie Lmape <leonie.lampe@gmail.com>
106126
Lukas Snoek <lukassnoek@gmail.com> Lukas Snoek <lukassnoek@gmail.com>
107127
Marcel Falkiewicz <mfalkiewicz@gmail.com> Marcel Falkiewicz <m.falkiewicz@nencki.gov.pl>
@@ -110,39 +130,45 @@ Mathias Goncalves <goncalves.mathias@gmail.com> mathiasg <mathiasg@mit.edu>
110130
Mathieu Dubois <mathieu.dubois@icm-institute.org> Mathieu Dubois <mathieu.dubois@cea.fr>
111131
Mathieu Dubois <mathieu.dubois@icm-institute.org> duboism <duboismathieu_gaas@yahoo.fr>
112132
Matteo Mancini <ingmatteomancini@gmail.com> matteomancini <ingmatteomancini@gmail.com>
113-
Matteo Visconti dOC <matteo.visconti.gr@dartmouth.edu> Matteo Visconti dOC <mvdoc.gr@dartmouth.edu>
114-
Matteo Visconti dOC <matteo.visconti.gr@dartmouth.edu> mvdoc <matteo.visconti.gr@dartmouth.edu>
133+
Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu> Matteo Visconti dOC <matteo.visconti.gr@dartmouth.edu>
134+
Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu> Matteo Visconti dOC <mvdoc.gr@dartmouth.edu>
135+
Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu> mvdoc <matteo.visconti.gr@dartmouth.edu>
115136
Michael Clark <michael.clark195@gmail.com> Clark <clarkmg@nih.gov>
116137
Michael Dayan <mdayan.research@gmail.com> Michael <mdayan.comp@gmail.com>
117138
Michael Dayan <mdayan.research@gmail.com> Michael <mdayan.research@gmail.com>
118139
Michael Dayan <mdayan.research@gmail.com> mick-d <mid2021@CHUCK.(none)>
119-
Michael Notter <michaelnotter@hotmail.com> miykael <michaelnotter@hotmail.com>
140+
Michael Philipp Notter <michaelnotter@hotmail.com> Michael Notter <michaelnotter@hotmail.com>
141+
Michael Philipp Notter <michaelnotter@hotmail.com> miykael <michaelnotter@hotmail.com>
120142
Michael Waskom <michael.l.waskom@gmail.com> Michael Waskom <mwaskom@mit.edu>
121143
Michael Waskom <michael.l.waskom@gmail.com> Michael Waskom <mwaskom@nyu.edu>
122144
Michael Waskom <michael.l.waskom@gmail.com> Michael Waskom <mwaskom@stanford.edu>
123145
Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@mit.edu>
124146
Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@nyu.edu>
125147
Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@stanford.edu>
148+
Miguel Molina-Romero <miguel.molina.romero@gmail.com> Miguel Molina <miguel.molina.romero@gmail.com>
126149
Oliver Contier <o.contier@gmail.com> oliver-contier <oliver.contier@ovgu.de>
127150
Oscar Esteban <code@oscaresteban.es> Oscar Esteban <code@oscaresteban>
128151
Oscar Esteban <code@oscaresteban.es> oesteban <code@oscaresteban.es>
129152
Pablo Polosecki <pipolose@us.ibm.com> pipolose <pipolose@pipoloses-MacBook-Air.local>
130153
Pablo Polosecki <pipolose@us.ibm.com> pipolose <pipolose@pipoloses-air.watson.ibm.com>
154+
Paul Sharp <psharp1289@gmail.com> psharp1289 <psharp1289@gmail.com>
131155
Ranjit Khanuja <ranjit.jhu@gmail.com> RanjitK <ranjit.jhu@gmail.com>
132156
Ross Markello <rossmarkello@gmail.com> Ross Markello <rdm222@cornell.edu>
133157
Russell Poldrack <poldrack@gmail.com> Russ Poldrack <poldrack@gmail.com>
134158
Russell Poldrack <poldrack@gmail.com> poldrack <poldrack@gmail.com>
135159
Salma Bougacha <salmabougacha@hotmail.com> Salma BOUGACHA <salmabougacha@hotmail.com>
136160
Salma Bougacha <salmabougacha@hotmail.com> salma <salmabougacha@hotmail.com>
137161
Salma Bougacha <salmabougacha@hotmail.com> salma1601 <salmabougacha@hotmail.com>
162+
Sami Kristian Andberg <sami.andberg@gmail.com> Sami Andberg <sami.andberg@gmail.com>
138163
Satrajit Ghosh <satrajit.ghosh@gmail.com> Satrajit Ghosh <satra@mit.edu>
139164
Sebastian Urchs <sebastian.urchs@gmail.com> sebastian <sebastian.urchs@gmail.com>
140165
Sharad Sikka <ssikka25@gmail.com> ssikka <ssikka25@gmail.com>
141166
Shariq Iqbal <shariqiqbal2810@gmail.com> shariqiqbal2810 <shariqiqbal2810@gmail.com>
142167
Shariq Iqbal <shariqiqbal2810@gmail.com> shariqiqbal2810 <shariqiqbal2810@users.noreply.github.com>
143168
Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <nope>
144169
Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <shoshber@users.noreply.github.com>
145-
Simon R <srothmei@mailbox.tu-berlin.de> Simon Rothmeier <srothmei@users.noreply.github.com>
170+
Simon Rothmei <srothmei@mailbox.tu-berlin.de> Simon R <srothmei@mailbox.tu-berlin.de>
171+
Simon Rothmei <srothmei@mailbox.tu-berlin.de> Simon Rothmeier <srothmei@users.noreply.github.com>
146172
Siqi Liu <lsqshr@gmail.com> siqi liu <lsqshr@gmail.com>
147173
Siqi Liu <lsqshr@gmail.com> sql <lsqshr@gmail.com>
148174
Steven Giavasis <sgiava77@gmail.com> Steven Giavasis <steven.giavasis@cmi-rsch-li001.childmind.org>

‎.travis.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ matrix:
6060
NIPYPE_EXTRAS="doc,tests,nipy,profiler"
6161
EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS"
6262
CI_SKIP_TEST=1
63-
allow_failures:
64-
- python: 2.7
65-
env: INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,nipy,profiler" EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS" CI_SKIP_TEST=1
6663

6764
addons:
6865
apt:
@@ -89,14 +86,15 @@ before_install:
8986
fi;
9087

9188
- travis_retry pip install -r requirements.txt
92-
- travis_retry pip install grabbit==0.1.2
93-
- travis_retry git clone -b 0.6.5 https://github.com/INCF/pybids.git ${HOME}/pybids && pip install -e ${HOME}/pybids
89+
- travis_retry pip install grabbit==0.2.6
90+
- travis_retry pip install -e git+https://github.com/bids-standard/pybids.git@0.7.0#egg=pybids
9491

9592
install:
9693
- travis_retry pip install $EXTRA_PIP_FLAGS -e .[$NIPYPE_EXTRAS]
94+
- travis_retry pip install pytest-xdist
9795

9896
script:
99-
- py.test -v --cov nipype --cov-config .coveragerc --cov-report xml:cov.xml -c nipype/pytest.ini --doctest-modules nipype
97+
- py.test -v --cov nipype --cov-config .coveragerc --cov-report xml:cov.xml -c nipype/pytest.ini --doctest-modules nipype -n auto
10098

10199
after_script:
102100
- codecov --file cov.xml --flags unittests -e TRAVIS_JOB_NUMBER

0 commit comments

Comments
 (0)