Skip to content

Commit 75a7471

Browse files
committed
Merge tag '1.1.3' into debian
Nipype 1.1.3 * tag '1.1.3': (34 commits) MAINT: Update Zenodo with latest line counts DOC: Update changelog MAINT: A few more .mailmap entries FIX: Return afni.Qwarp outputs as absolute paths DOC: .mailmap (low-hanging fruit) DOC: Update version strings DOC: Changelog 1.1.3 MAINT: Bump version string to 1.1.3 FIX: MCFLIRT output paths are relative to out_file, not cwd FIX: Drop Bunch.keys, use existing dictcopy method TEST: Check RuntimeErrors raised for missing/broken runtimes FIX: Check for runtime attributes Reorganized exception catching in _strip_header() for better code clarity FIX: make exception explicit Change in normalize_mc_params fix/enh: added the colorfa as an output in DTI FIX: catch exception if jobid not found in squeue call FIX: Provide informative error for interfaces that fail to return runtime object Fixed: Missing substring should raise ValueError not KeyError RF: Use runtime.cwd in Rename ...
2 parents 4a2f655 + ec7457c commit 75a7471

File tree

22 files changed

+266
-119
lines changed

22 files changed

+266
-119
lines changed

.github/release-drafter.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
template: |
2+
## What's Changed
3+
4+
$CHANGES

.mailmap

Lines changed: 50 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
Aimi Watanabe <[email protected]> stymy <[email protected]>
22
Aimi Watanabe <[email protected]> stymy <[email protected]>
3+
Alejandro Tabas <[email protected]> qTabs <[email protected]>
4+
Alejandro Tabas <[email protected]> qtabs <[email protected]>
35
Alejandro de la Vega <[email protected]> adelavega <[email protected]>
46
Alexander Schaefer <[email protected]> Alexander Schaefer <[email protected]>
57
Alexander Schaefer <[email protected]> alexschaefer83 <[email protected]>
68
Alexander Schaefer <[email protected]> aschaefer <aschaefer@aschaefer-U36SD.(none)>
79
Alexandre M. Savio <[email protected]> Alexandre M. S <[email protected]>
810
Alexandre M. Savio <[email protected]> Alexandre M. S <[email protected]>
911
Alexandre M. Savio <[email protected]> Alexandre Manhaes Savio <[email protected]>
12+
Andrey Chetverikov <[email protected]> Andrey Chetverikov <[email protected]>
13+
Andrey Chetverikov <[email protected]> achetverikov <[email protected]>
1014
Anisha Keshavan <[email protected]> Anisha Keshavan <[email protected]>
1115
Anisha Keshavan <[email protected]> akeshavan <[email protected]>
1216
Ariel Rokem <[email protected]> arokem <[email protected]>
1317
Ariel Rokem <[email protected]> arokem <[email protected]>
1418
Arman Eshaghi <[email protected]> armaneshaghi <[email protected]>
1519
Ashely Gillman <[email protected]> Ashley Gillman <[email protected]>
1620
Ashely Gillman <[email protected]> ashgillman <[email protected]>
17-
Andrey Chetverikov <[email protected]> achetverikov <[email protected]>
1821
Basille Pinsard <[email protected]> bpinsard <[email protected]>
1922
Basille Pinsard <[email protected]> bpinsard <[email protected]>
2023
Ben Cipollini <[email protected]> Ben Cipollini <[email protected]>
@@ -24,6 +27,7 @@ Blake Dewey <[email protected]> Blake Dewey <[email protected]>
2427
Blake Dewey <[email protected]> blakedewey <[email protected]>
2528
Blake Dewey <[email protected]> blakedewey <[email protected]>
2629
Brendan Moloney <[email protected]> moloney <[email protected]>
30+
Caroline Froehlich <[email protected]> carolFrohlich <[email protected]>
2731
Chris Filo Gorgolewski <[email protected]> Chris Filo Gorgolewski <filo@filo-Precision-M6500.(none)>
2832
Chris Filo Gorgolewski <[email protected]> Chris Filo Gorgolewski <[email protected]>
2933
Chris Filo Gorgolewski <[email protected]> Chris Filo Gorgolewski <[email protected]>
@@ -40,21 +44,28 @@ Cindee Madison <[email protected]> cindeem
4044
Cindee Madison <[email protected]> cindeem <>
4145
Colin Buchanan <[email protected]> Colin Buchanan <cbuchanan@cray4.(none)>
4246
Colin Buchanan <[email protected]> colinbuchanan <[email protected]>
47+
Daniel Brenner <[email protected]> brennerd <[email protected]>
48+
Daniel Brenner <[email protected]> brennerd11 <[email protected]>
4349
Daniel Clark <[email protected]> dclark87 <[email protected]>
50+
Daniel Geisler <[email protected]> daniel-ge <[email protected]>
4451
Daniel Ginsburg <[email protected]> danginsburg <[email protected]>
4552
Daniel McNamee <[email protected]> danmc <[email protected]>
4653
David Ellis <[email protected]> David Ellis <[email protected]>
4754
David Ellis <[email protected]> David Ellis <[email protected]>
4855
David Welch <[email protected]> David Welch <[email protected]>
56+
Dimitri Papadopoulos Orfanos <[email protected]> Dimitri Papadopoulos <[email protected]>
4957
58+
Dylan Nielson <[email protected]> Dylan <[email protected]>
59+
Elizabeth DuPre <[email protected]> emdupre <[email protected]>
5060
5161
Erik Ziegler <[email protected]> Erik Ziegler <[email protected]>
5262
Erik Ziegler <[email protected]> erik <erik@erik-ubuntu.(none)>
5363
Erik Ziegler <[email protected]> erikz <[email protected]>
5464
Erik Ziegler <[email protected]> swederik <[email protected]>
5565
Fernando Pérez-García <[email protected]> Fernando <[email protected]>
56-
5766
Franz Liem <[email protected]> fliem <franz.liem>
67+
68+
Fred Loney <[email protected]> FredLoney <[email protected]>
5869
Gael Varoquaux <[email protected]> GaelVaroquaux
5970
Gael Varoquaux <[email protected]> GaelVaroquaux <[email protected]>
6071
Gavin Cooper <[email protected]> gjcooper <[email protected]>
@@ -63,40 +74,70 @@ Hans Johnson <[email protected]> Hans Johnson <[email protected]>
6374
Hans Johnson <[email protected]> hjmjohnson <[email protected]>
6475
Horea Christian <[email protected]> Horea Christian <[email protected]>
6576
Isaac Schwabacher <[email protected]> ischwabacher <[email protected]>
66-
James Kent <james-kent@uiowa.edu> jdkent <james-kent@uiowa.edu>
77+
Jakub Kaczmarzyk <jakubk@mit.edu> jakubk <jakubk@mit.edu>
6778
Jakub Kaczmarzyk <[email protected]> kaczmarj <[email protected]>
79+
80+
Janosch Linkersdörfer <[email protected]> Januzz <[email protected]>
6881
69-
70-
Jason Wong <[email protected]> Jason W <[email protected]>
7182
Jason Wong <[email protected]> Jason W <[email protected]>
83+
Jason Wong <[email protected]> Jason W <[email protected]>
84+
7285
Jason Wong <[email protected]> jason-wg <[email protected]>
7386
Jens Kleesiek <[email protected]> JensNRAD <[email protected]>
87+
Jessica Forbes <[email protected]> jessicaforbes <[email protected]>
88+
Jérémy Guillon <[email protected]> GUILLON Jeremy <[email protected]>
7489
Joerg Stadler <[email protected]> Joerg Stadler <[email protected]>
7590
Joerg Stadler <[email protected]> Jörg Stadler <[email protected]>
7691
Joke Durnez <[email protected]> jokedurnez <[email protected]>
92+
Josh Warner <[email protected]> JDWarner <[email protected]>
7793
Josh Warner <[email protected]> Josh Warner (Mac) <[email protected]>
7894
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]>
97+
Kesshi Jordan <[email protected]> Kesshi Jordan <[email protected]>
98+
Kesshi Jordan <[email protected]> Kesshi Jordan <[email protected]>
99+
Kesshi Jordan <[email protected]> Kesshi Jordan <[email protected]>
100+
Kesshi Jordan <[email protected]> Kesshi Jordan <[email protected]>
101+
Kesshi Jordan <[email protected]> Kesshi jordan <[email protected]>
102+
Kesshi Jordan <[email protected]> kesshijordan <[email protected]>
79103
104+
80105
Leonie Lampe <[email protected]> Leonie Lmape <[email protected]>
81106
Lukas Snoek <[email protected]> Lukas Snoek <[email protected]>
107+
Marcel Falkiewicz <[email protected]> Marcel Falkiewicz <[email protected]>
108+
Mathias Goncalves <[email protected]> Mathias Goncalves <[email protected]>
82109
Mathias Goncalves <[email protected]> mathiasg <[email protected]>
110+
Mathieu Dubois <[email protected]> Mathieu Dubois <[email protected]>
111+
Mathieu Dubois <[email protected]> duboism <[email protected]>
83112
Matteo Mancini <[email protected]> matteomancini <[email protected]>
113+
Matteo Visconti dOC <[email protected]> Matteo Visconti dOC <[email protected]>
84114
Matteo Visconti dOC <[email protected]> mvdoc <[email protected]>
85-
Michael Dayan <mdayan.research@gmail.com> Michael <[email protected]>
115+
Michael Clark <michael.clark195@gmail.com> Clark <[email protected]>
86116
Michael Dayan <[email protected]> Michael <[email protected]>
117+
Michael Dayan <[email protected]> Michael <[email protected]>
87118
Michael Dayan <[email protected]> mick-d <mid2021@CHUCK.(none)>
88-
Michael Clark <[email protected]> Clark <[email protected]>
89119
Michael Notter <[email protected]> miykael <[email protected]>
90120
Michael Waskom <[email protected]> Michael Waskom <[email protected]>
121+
Michael Waskom <[email protected]> Michael Waskom <[email protected]>
91122
Michael Waskom <[email protected]> Michael Waskom <[email protected]>
92123
Michael Waskom <[email protected]> mwaskom <[email protected]>
93-
Michael Waskom <[email protected]> mwaskom <[email protected]>
94124
Michael Waskom <[email protected]> mwaskom <[email protected]>
125+
Michael Waskom <[email protected]> mwaskom <[email protected]>
126+
Oliver Contier <[email protected]> oliver-contier <[email protected]>
95127
Oscar Esteban <[email protected]> Oscar Esteban <code@oscaresteban>
96128
Oscar Esteban <[email protected]> oesteban <[email protected]>
129+
Pablo Polosecki <[email protected]> pipolose <[email protected]>
130+
Pablo Polosecki <[email protected]> pipolose <[email protected]>
131+
Ranjit Khanuja <[email protected]> RanjitK <[email protected]>
132+
Ross Markello <[email protected]> Ross Markello <[email protected]>
97133
Russell Poldrack <[email protected]> Russ Poldrack <[email protected]>
98134
Russell Poldrack <[email protected]> poldrack <[email protected]>
135+
Salma Bougacha <[email protected]> Salma BOUGACHA <[email protected]>
136+
Salma Bougacha <[email protected]> salma <[email protected]>
137+
Salma Bougacha <[email protected]> salma1601 <[email protected]>
99138
Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
139+
Sebastian Urchs <[email protected]> sebastian <[email protected]>
140+
Sharad Sikka <[email protected]> ssikka <[email protected]>
100141
Shariq Iqbal <[email protected]> shariqiqbal2810 <[email protected]>
101142
Shariq Iqbal <[email protected]> shariqiqbal2810 <[email protected]>
102143
Shoshana Berleant <[email protected]> Shoshana Berleant <nope>
@@ -111,5 +152,5 @@ Tristan Glatard <[email protected]> Tristan Glatard <tristan.glatard@cre
111152
Victor Saase <[email protected]> vsaase <[email protected]>
112153
William Triplett <[email protected]> William Triplett <[email protected]>
113154
Wolfgang Pauli <[email protected]> Wolfgang Pauli <[email protected]>
155+
Xiangzhen Kong <[email protected]> bnucon <[email protected]>
114156
Yaroslav Halchenko <[email protected]> Yaroslav Halchenko <[email protected]>
115-

.travis.yml

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,66 @@
1-
dist: trusty
2-
sudo: required
1+
dist: xenial
2+
sudo: true
33

44
language: python
55
# our build matrix
66
python:
77
- 2.7
8-
- 3.4
98
- 3.5
109
- 3.6
10+
- 3.7
1111

12+
# NOTE: Any changes to the matrix section should be duplicated below for
13+
# Python 3.4
1214
env:
1315
global:
1416
- EXTRA_WHEELS="https://5cf40426d9f06eb7461d-6fe47d9331aba7cd62fc36c7196769e4.ssl.cf2.rackcdn.com"
1517
- PRE_WHEELS="https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"
1618
- EXTRA_PIP_FLAGS="--find-links=$EXTRA_WHEELS"
1719
matrix:
1820
- INSTALL_DEB_DEPENDECIES=true
19-
NIPYPE_EXTRAS="doc,tests,fmri,profiler"
21+
NIPYPE_EXTRAS="doc,tests,nipy,profiler"
2022
CI_SKIP_TEST=1
2123
- INSTALL_DEB_DEPENDECIES=false
22-
NIPYPE_EXTRAS="doc,tests,fmri,profiler"
24+
NIPYPE_EXTRAS="doc,tests,profiler"
2325
CI_SKIP_TEST=1
2426
- INSTALL_DEB_DEPENDECIES=true
25-
NIPYPE_EXTRAS="doc,tests,fmri,profiler,duecredit,ssh"
27+
NIPYPE_EXTRAS="doc,tests,nipy,profiler,duecredit,ssh"
2628
CI_SKIP_TEST=1
2729
- INSTALL_DEB_DEPENDECIES=true
28-
NIPYPE_EXTRAS="doc,tests,fmri,profiler"
30+
NIPYPE_EXTRAS="doc,tests,nipy,profiler"
2931
EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS"
3032
CI_SKIP_TEST=1
3133

34+
# Python 3.4 is only available on Trusty, so we need to duplicate the
35+
# env matrix specifically for it.
36+
matrix:
37+
include:
38+
- python: 3.4
39+
dist: trusty
40+
env:
41+
- INSTALL_DEB_DEPENDECIES=true
42+
NIPYPE_EXTRAS="doc,tests,nipy,profiler"
43+
CI_SKIP_TEST=1
44+
- python: 3.4
45+
dist: trusty
46+
env:
47+
- INSTALL_DEB_DEPENDECIES=false
48+
NIPYPE_EXTRAS="doc,tests,profiler"
49+
CI_SKIP_TEST=1
50+
- python: 3.4
51+
dist: trusty
52+
env:
53+
- INSTALL_DEB_DEPENDECIES=true
54+
NIPYPE_EXTRAS="doc,tests,nipy,profiler,duecredit,ssh"
55+
CI_SKIP_TEST=1
56+
- python: 3.4
57+
dist: trusty
58+
env:
59+
- INSTALL_DEB_DEPENDECIES=true
60+
NIPYPE_EXTRAS="doc,tests,nipy,profiler"
61+
EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS"
62+
CI_SKIP_TEST=1
63+
3264
addons:
3365
apt:
3466
packages:

0 commit comments

Comments
 (0)