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 <[email protected]> stymy <[email protected]>
33
Alejandro Tabas <[email protected]> qTabs <[email protected]>
44
Alejandro Tabas <[email protected]> qtabs <[email protected]>
55
Alejandro de la Vega <[email protected]> adelavega <[email protected]>
6+
Alejandro de la Vega <[email protected]> delavega4 <[email protected]>
67
Alexander Schaefer <[email protected]> Alexander Schaefer <[email protected]>
78
Alexander Schaefer <[email protected]> alexschaefer83 <[email protected]>
89
Alexander Schaefer <[email protected]> aschaefer <aschaefer@aschaefer-U36SD.(none)>
910
Alexandre M. Savio <[email protected]> Alexandre M. S <[email protected]>
1011
Alexandre M. Savio <[email protected]> Alexandre M. S <[email protected]>
1112
Alexandre M. Savio <[email protected]> Alexandre Manhaes Savio <[email protected]>
13+
Andrew Floren <[email protected]> afloren <[email protected]>
1214
Andrey Chetverikov <[email protected]> Andrey Chetverikov <[email protected]>
1315
Andrey Chetverikov <[email protected]> achetverikov <[email protected]>
16+
Anibal Sólon Heinsfeld <[email protected]> anibalsolon <[email protected]>
1417
Anisha Keshavan <[email protected]> Anisha Keshavan <[email protected]>
1518
Anisha Keshavan <[email protected]> akeshavan <[email protected]>
19+
Ariel Rokem <[email protected]> Ariel Rokem <[email protected]>
1620
Ariel Rokem <[email protected]> arokem <[email protected]>
1721
Ariel Rokem <[email protected]> arokem <[email protected]>
1822
Arman Eshaghi <[email protected]> armaneshaghi <[email protected]>
@@ -21,22 +25,16 @@ Ashely Gillman <[email protected]> ashgillman <[email protected]>
2125
Basille Pinsard <[email protected]> bpinsard <[email protected]>
2226
Basille Pinsard <[email protected]> bpinsard <[email protected]>
2327
Ben Cipollini <[email protected]> Ben Cipollini <[email protected]>
28+
Benjamin Acland <[email protected]> Ben Acland <[email protected]>
2429
Benjamin Yvernault <[email protected]> Benjamin Yvernault <[email protected]>
2530
Benjamin Yvernault <[email protected]> byvernault <[email protected]>
2631
Blake Dewey <[email protected]> Blake Dewey <[email protected]>
2732
Blake Dewey <[email protected]> blakedewey <[email protected]>
2833
Blake Dewey <[email protected]> blakedewey <[email protected]>
2934
Brendan Moloney <[email protected]> moloney <[email protected]>
3035
Caroline Froehlich <[email protected]> carolFrohlich <[email protected]>
31-
Chris Filo Gorgolewski <[email protected]> Chris Filo Gorgolewski <filo@filo-Precision-M6500.(none)>
32-
Chris Filo Gorgolewski <[email protected]> Chris Filo Gorgolewski <[email protected]>
33-
Chris Filo Gorgolewski <[email protected]> Chris Filo Gorgolewski <[email protected]>
34-
Chris Filo Gorgolewski <[email protected]> Chris Gorgolewski <[email protected]>
35-
Chris Filo Gorgolewski <[email protected]> Krzysztof Gorgolewski <[email protected]>
36-
Chris Filo Gorgolewski <[email protected]> filo <filo@filo-Precision-M6500>
37-
Chris Filo Gorgolewski <[email protected]> filo <filo@filo-dtc-laptop>
38-
Chris Filo Gorgolewski <[email protected]> filo <filo@filolaptop>
3936
Christopher J. Markiewicz <[email protected]> Chris Markiewicz <[email protected]>
37+
Christopher J. Markiewicz <[email protected]> Chris Markiewicz <[email protected]>
4038
Christopher J. Markiewicz <[email protected]> Christopher J. Johnson <[email protected]>
4139
Christopher J. Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
4240
Christopher J. Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
@@ -52,16 +50,20 @@ Daniel Ginsburg <[email protected]> danginsburg <daniel.gins
5250
Daniel McNamee <[email protected]> danmc <[email protected]>
5351
David Ellis <[email protected]> David Ellis <[email protected]>
5452
David Ellis <[email protected]> David Ellis <[email protected]>
53+
David Mordom <[email protected]> dmordom <[email protected]>
5554
David Welch <[email protected]> David Welch <[email protected]>
5655
Dimitri Papadopoulos Orfanos <[email protected]> Dimitri Papadopoulos <[email protected]>
5756
Dmytro <[email protected]> belevtsoff <[email protected]>
58-
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+
Eduard Ort <[email protected]> eort <[email protected]>
5960
Elizabeth DuPre <[email protected]> emdupre <[email protected]>
6061
Erik Ziegler <[email protected]> Erik <[email protected]>
6162
Erik Ziegler <[email protected]> Erik Ziegler <[email protected]>
6263
Erik Ziegler <[email protected]> erik <erik@erik-ubuntu.(none)>
6364
Erik Ziegler <[email protected]> erikz <[email protected]>
6465
Erik Ziegler <[email protected]> swederik <[email protected]>
66+
Feilong Ma <[email protected]> Ma Feilong <[email protected]>
6567
Fernando Pérez-García <[email protected]> Fernando <[email protected]>
6668
Franz Liem <[email protected]> fliem <franz.liem>
6769
Franz Liem <[email protected]> fliem <[email protected]>
@@ -70,6 +72,8 @@ Gael Varoquaux <[email protected]> GaelVaroquaux
7072
Gael Varoquaux <[email protected]> GaelVaroquaux <[email protected]>
7173
Gavin Cooper <[email protected]> gjcooper <[email protected]>
7274
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]>
7377
Hans Johnson <[email protected]> Hans Johnson <[email protected]>
7478
Hans Johnson <[email protected]> hjmjohnson <[email protected]>
7579
Horea Christian <[email protected]> Horea Christian <[email protected]>
@@ -87,13 +91,17 @@ Jens Kleesiek <[email protected]> JensNRAD <[email protected]>
8791
Jessica Forbes <[email protected]> jessicaforbes <[email protected]>
8892
Jérémy Guillon <[email protected]> GUILLON Jeremy <[email protected]>
8993
Joerg Stadler <[email protected]> Joerg Stadler <[email protected]>
94+
Joerg Stadler <[email protected]> Joerg Stadler <[email protected]>
9095
Joerg Stadler <[email protected]> Jörg Stadler <[email protected]>
96+
John Lee <[email protected]> john anthony lee <[email protected]>
97+
John Lee <[email protected]> leej3 <[email protected]>
9198
Joke Durnez <[email protected]> jokedurnez <[email protected]>
9299
Josh Warner <[email protected]> JDWarner <[email protected]>
93100
Josh Warner <[email protected]> Josh Warner (Mac) <[email protected]>
94-
Kai Schlamp <[email protected]> medihack <[email protected]>Jessica Forbes <[email protected]> jessicaforbes <[email protected]>
95-
Katie Bottenhorn <[email protected]> 62442katieb <[email protected]>
96-
Kesshi Jordan <[email protected]> Kesshi Jordan <[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]>
104+
Kesshi Jordan <[email protected]> Kesshi Jordan <[email protected]>
97105
Kesshi Jordan <[email protected]> Kesshi Jordan <[email protected]>
98106
Kesshi Jordan <[email protected]> Kesshi Jordan <[email protected]>
99107
Kesshi Jordan <[email protected]> Kesshi Jordan <[email protected]>
@@ -102,6 +110,18 @@ Kesshi Jordan <[email protected]> Kesshi jordan <[email protected]
102110
Kesshi Jordan <[email protected]> kesshijordan <[email protected]>
103111
Kevin Sitek <[email protected]> sitek <[email protected]>
104112
Kevin Sitek <[email protected]> sitek <[email protected]>
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]>
105125
Leonie Lampe <[email protected]> Leonie Lmape <[email protected]>
106126
Lukas Snoek <[email protected]> Lukas Snoek <[email protected]>
107127
Marcel Falkiewicz <[email protected]> Marcel Falkiewicz <[email protected]>
@@ -110,39 +130,45 @@ Mathias Goncalves <[email protected]> mathiasg <[email protected]>
110130
Mathieu Dubois <[email protected]> Mathieu Dubois <[email protected]>
111131
Mathieu Dubois <[email protected]> duboism <[email protected]>
112132
Matteo Mancini <[email protected]> matteomancini <[email protected]>
113-
Matteo Visconti dOC <[email protected]> Matteo Visconti dOC <[email protected]>
114-
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]>
115136
Michael Clark <[email protected]> Clark <[email protected]>
116137
Michael Dayan <[email protected]> Michael <[email protected]>
117138
Michael Dayan <[email protected]> Michael <[email protected]>
118139
Michael Dayan <[email protected]> mick-d <mid2021@CHUCK.(none)>
119-
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]>
120142
Michael Waskom <[email protected]> Michael Waskom <[email protected]>
121143
Michael Waskom <[email protected]> Michael Waskom <[email protected]>
122144
Michael Waskom <[email protected]> Michael Waskom <[email protected]>
123145
Michael Waskom <[email protected]> mwaskom <[email protected]>
124146
Michael Waskom <[email protected]> mwaskom <[email protected]>
125147
Michael Waskom <[email protected]> mwaskom <[email protected]>
148+
Miguel Molina-Romero <[email protected]> Miguel Molina <[email protected]>
126149
Oliver Contier <[email protected]> oliver-contier <[email protected]>
127150
Oscar Esteban <[email protected]> Oscar Esteban <code@oscaresteban>
128151
Oscar Esteban <[email protected]> oesteban <[email protected]>
129152
Pablo Polosecki <[email protected]> pipolose <[email protected]>
130153
Pablo Polosecki <[email protected]> pipolose <[email protected]>
154+
Paul Sharp <[email protected]> psharp1289 <[email protected]>
131155
Ranjit Khanuja <[email protected]> RanjitK <[email protected]>
132156
Ross Markello <[email protected]> Ross Markello <[email protected]>
133157
Russell Poldrack <[email protected]> Russ Poldrack <[email protected]>
134158
Russell Poldrack <[email protected]> poldrack <[email protected]>
135159
Salma Bougacha <[email protected]> Salma BOUGACHA <[email protected]>
136160
Salma Bougacha <[email protected]> salma <[email protected]>
137161
Salma Bougacha <[email protected]> salma1601 <[email protected]>
162+
Sami Kristian Andberg <[email protected]> Sami Andberg <[email protected]>
138163
Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
139164
Sebastian Urchs <[email protected]> sebastian <[email protected]>
140165
Sharad Sikka <[email protected]> ssikka <[email protected]>
141166
Shariq Iqbal <[email protected]> shariqiqbal2810 <[email protected]>
142167
Shariq Iqbal <[email protected]> shariqiqbal2810 <[email protected]>
143168
Shoshana Berleant <[email protected]> Shoshana Berleant <nope>
144169
Shoshana Berleant <[email protected]> Shoshana Berleant <[email protected]>
145-
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]>
146172
Siqi Liu <[email protected]> siqi liu <[email protected]>
147173
Siqi Liu <[email protected]> sql <[email protected]>
148174
Steven Giavasis <[email protected]> Steven Giavasis <[email protected]>

‎.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)