Skip to content

Commit f2bbcc9

Browse files
authored
Merge pull request #2829 from nipy/rel/1.1.7
REL: 1.1.7
2 parents 5d37cae + 04b0b31 commit f2bbcc9

File tree

5 files changed

+76
-50
lines changed

5 files changed

+76
-50
lines changed

.zenodo.json

+30-30
Original file line numberDiff line numberDiff line change
@@ -89,32 +89,32 @@
8989
"name": "Clark, Daniel",
9090
"orcid": "0000-0002-8121-8954"
9191
},
92-
{
93-
"affiliation": "Department of Electrical and Computer Engineering, Johns Hopkins University",
94-
"name": "Dewey, Blake E",
95-
"orcid": "0000-0003-4554-5058"
96-
},
9792
{
9893
"affiliation": "National Institute of Mental Health",
9994
"name": "Nielson, Dylan M.",
10095
"orcid": "0000-0003-4613-6643"
10196
},
97+
{
98+
"affiliation": "Department of Electrical and Computer Engineering, Johns Hopkins University",
99+
"name": "Dewey, Blake E",
100+
"orcid": "0000-0003-4554-5058"
101+
},
102102
{
103103
"name": "Madison, Cindee"
104104
},
105105
{
106106
"affiliation": "Molecular Imaging Research Center, CEA, France",
107107
"name": "Bougacha, Salma"
108108
},
109+
{
110+
"affiliation": "National Institutes of Health",
111+
"name": "Clark, Michael G. "
112+
},
109113
{
110114
"affiliation": "Dartmouth College",
111115
"name": "Visconti di Oleggio Castello, Matteo",
112116
"orcid": "0000-0001-7931-5272"
113117
},
114-
{
115-
"affiliation": "National Institutes of Health",
116-
"name": "Clark, Michael G. "
117-
},
118118
{
119119
"affiliation": "Mayo Clinic, Neurology, Rochester, MN, USA",
120120
"name": "Dayan, Michael",
@@ -199,14 +199,14 @@
199199
"name": "Gilles de Hollander",
200200
"orcid": "0000-0003-1988-5091"
201201
},
202+
{
203+
"name": "Mordom, David"
204+
},
202205
{
203206
"affiliation": "Australian eHealth Research Centre, Commonwealth Scientific and Industrial Research Organisation; University of Queensland",
204207
"name": "Gillman, Ashley",
205208
"orcid": "0000-0001-9130-1092"
206209
},
207-
{
208-
"name": "Mordom, David"
209-
},
210210
{
211211
"name": "Buchanan, Colin"
212212
},
@@ -218,11 +218,6 @@
218218
"name": "Pauli, Wolfgang M.",
219219
"orcid": "0000-0002-0966-0254"
220220
},
221-
{
222-
"affiliation": "Duke University",
223-
"name": "Iqbal, Shariq",
224-
"orcid": "0000-0003-2766-8425"
225-
},
226221
{
227222
"affiliation": "Nathan s Kline institute for psychiatric research",
228223
"name": "Sikka, Sharad"
@@ -235,6 +230,11 @@
235230
{
236231
"name": "Forbes, Jessica"
237232
},
233+
{
234+
"affiliation": "Duke University",
235+
"name": "Iqbal, Shariq",
236+
"orcid": "0000-0003-2766-8425"
237+
},
238238
{
239239
"name": "Schwartz, Yannick"
240240
},
@@ -278,11 +278,6 @@
278278
"name": "Eshaghi, Arman",
279279
"orcid": "0000-0002-6652-3512"
280280
},
281-
{
282-
"affiliation": "Harvard University - Psychology",
283-
"name": "Kastman, Erik",
284-
"orcid": "0000-0001-7221-9042"
285-
},
286281
{
287282
"name": "Ginsburg, Daniel"
288283
},
@@ -291,6 +286,11 @@
291286
"name": "Schaefer, Alexander",
292287
"orcid": "0000-0001-6488-4739"
293288
},
289+
{
290+
"affiliation": "Harvard University - Psychology",
291+
"name": "Kastman, Erik",
292+
"orcid": "0000-0001-7221-9042"
293+
},
294294
{
295295
"affiliation": "Washington University in St Louis",
296296
"name": "Acland, Benjamin",
@@ -312,9 +312,6 @@
312312
"affiliation": "Child Mind Institute",
313313
"name": "Giavasis, Steven"
314314
},
315-
{
316-
"name": "Haselgrove, Christian"
317-
},
318315
{
319316
"name": "Correa, Carlos"
320317
},
@@ -336,6 +333,9 @@
336333
{
337334
"name": "Blair, Ross"
338335
},
336+
{
337+
"name": "Haselgrove, Christian"
338+
},
339339
{
340340
"affiliation": "1 McGill Centre for Integrative Neuroscience (MCIN), Ludmer Centre for Neuroinformatics and Mental Health, Montreal Neurological Institute (MNI), McGill University, Montr\u00e9al, 3801 University Street, WB-208, H3A 2B4, Qu\u00e9bec, Canada. 2 University of Lyon, CNRS, INSERM, CREATIS., Villeurbanne, 7, avenue Jean Capelle, 69621, France.",
341341
"name": "Glatard, Tristan",
@@ -380,16 +380,16 @@
380380
{
381381
"name": "Hallquist, Michael"
382382
},
383-
{
384-
"affiliation": "GIGA Institute",
385-
"name": "Grignard, Martin",
386-
"orcid": "0000-0001-5549-1861"
387-
},
388383
{
389384
"affiliation": "Donders Institute for Brain, Cognition and Behavior, Center for Cognitive Neuroimaging",
390385
"name": "Chetverikov, Andrey",
391386
"orcid": "0000-0003-2767-6310"
392387
},
388+
{
389+
"affiliation": "GIGA Institute",
390+
"name": "Grignard, Martin",
391+
"orcid": "0000-0001-5549-1861"
392+
},
393393
{
394394
"name": "Salvatore, John"
395395
},

doc/changelog/1.X.X-changelog

+34-14
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,42 @@
1+
1.1.7 (December 17, 2018)
2+
=========================
3+
4+
* FIX: Copy node list before generating a flat graph (https://github.com/nipy/nipype/pull/2828)
5+
* FIX: Update pytest req'd version to 3.6 (https://github.com/nipy/nipype/pull/2827)
6+
* FIX: Set ResourceMonitor.fname to an absolute path (https://github.com/nipy/nipype/pull/2824)
7+
* FIX: Order of SPM.NewSegment channel_info boolean tuple is (Field, Corrected) (https://github.com/nipy/nipype/pull/2817)
8+
* FIX: Indices were swapped for memory and cpu profile data (https://github.com/nipy/nipype/pull/2816)
9+
* FIX: ``status_callback`` not called with ``stop_on_first_crash`` (https://github.com/nipy/nipype/pull/2810)
10+
* FIX: Change undefined ScriptError on LFS plugin to IOError (https://github.com/nipy/nipype/pull/2803)
11+
* ENH: Add NaN failure mode to CompCor interfaces (https://github.com/nipy/nipype/pull/2819)
12+
* ENH: Enable cnr_maps and residuals outputs for FSL eddy (https://github.com/nipy/nipype/pull/2750)
13+
* ENH: Improve ``str2bool`` + doctests (https://github.com/nipy/nipype/pull/2807)
14+
* TST: Improve py.test configuration of doctests (https://github.com/nipy/nipype/pull/2802)
15+
* DOC: Update DOI badge to point to all versions (https://github.com/nipy/nipype/pull/2804)
16+
* MAINT: Offload interfaces with help formatting (https://github.com/nipy/nipype/pull/2797)
17+
* MAINT: Reduce minimal code redundancy in filemanip.get_dependencies (https://github.com/nipy/nipype/pull/2782)
18+
* MAINT: Delayed imports to reduce import time (https://github.com/nipy/nipype/pull/2809)
19+
20+
121
1.1.6 (November 26, 2018)
222
=========================
323

424
##### [Full changelog](https://github.com/nipy/nipype/milestone/27?closed=1)
525

6-
* [FIX] MapNodes fail when ``MultiProcPlugin`` passed by instance (https://github.com/nipy/nipype/pull/2786)
7-
* [FIX] --fineTune arguments order for MeshFix command (https://github.com/nipy/nipype/pull/2780)
8-
* [ENH] Add mp_context plugin arg for MultiProc (https://github.com/nipy/nipype/pull/2778)
9-
* [ENH] Create a crashfile even if 'stop_on_first_crash' is set (https://github.com/nipy/nipype/pull/2774)
10-
* [ENH] Add ExtractedBrainN4 output to ANTs CorticalThickness interface (https://github.com/nipy/nipype/pull/2784)
11-
* [STY] Combine split import (https://github.com/nipy/nipype/pull/2801)
12-
* [DOC] use https in css stylesheet url (https://github.com/nipy/nipype/pull/2779)
13-
* [MAINT] Outsource ``get_filecopy_info()`` from interfaces (https://github.com/nipy/nipype/pull/2798)
14-
* [MAINT] Import only Sequence to avoid DeprecationWarning (https://github.com/nipy/nipype/pull/2793)
15-
* [MAINT] One less DeprecationWarning (configparser) (https://github.com/nipy/nipype/pull/2794)
16-
* [MAINT] DeprecationWarning: use ``HasTraits.trait_set`` instead (https://github.com/nipy/nipype/pull/2792)
17-
* [MAINT] Stop using deprecated ``logger.warn()`` (https://github.com/nipy/nipype/pull/2788)
18-
* [MAINT] Move ``interfaces.base.run_command`` to ``nipype.utils.subprocess`` (https://github.com/nipy/nipype/pull/2777)
19-
* [MAINT] Force numpy>=1.15.4 when Python>=3.7 (https://github.com/nipy/nipype/pull/2775)
26+
* FIX: MapNodes fail when ``MultiProcPlugin`` passed by instance (https://github.com/nipy/nipype/pull/2786)
27+
* FIX: --fineTune arguments order for MeshFix command (https://github.com/nipy/nipype/pull/2780)
28+
* ENH: Add mp_context plugin arg for MultiProc (https://github.com/nipy/nipype/pull/2778)
29+
* ENH: Create a crashfile even if 'stop_on_first_crash' is set (https://github.com/nipy/nipype/pull/2774)
30+
* ENH: Add ExtractedBrainN4 output to ANTs CorticalThickness interface (https://github.com/nipy/nipype/pull/2784)
31+
* STY: Combine split import (https://github.com/nipy/nipype/pull/2801)
32+
* DOC: use https in css stylesheet url (https://github.com/nipy/nipype/pull/2779)
33+
* MAINT: Outsource ``get_filecopy_info()`` from interfaces (https://github.com/nipy/nipype/pull/2798)
34+
* MAINT: Import only Sequence to avoid DeprecationWarning (https://github.com/nipy/nipype/pull/2793)
35+
* MAINT: One less DeprecationWarning (configparser) (https://github.com/nipy/nipype/pull/2794)
36+
* MAINT: DeprecationWarning: use ``HasTraits.trait_set`` instead (https://github.com/nipy/nipype/pull/2792)
37+
* MAINT: Stop using deprecated ``logger.warn()`` (https://github.com/nipy/nipype/pull/2788)
38+
* MAINT: Move ``interfaces.base.run_command`` to ``nipype.utils.subprocess`` (https://github.com/nipy/nipype/pull/2777)
39+
* MAINT: Force numpy>=1.15.4 when Python>=3.7 (https://github.com/nipy/nipype/pull/2775)
2040

2141

2242
1.1.5 (November 08, 2018)

doc/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
# The short X.Y version.
8383
version = nipype.__version__
8484
# The full version, including alpha/beta/rc tags.
85-
release = "1.1.6"
85+
release = "1.1.7"
8686

8787
# The language for content autogenerated by Sphinx. Refer to documentation
8888
# for a list of supported languages.

nipype/info.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# full release. '.dev' as a version_extra string means this is a development
1212
# version
1313
# Remove -dev for release
14-
__version__ = '1.1.7-dev'
14+
__version__ = '1.1.7'
1515

1616

1717
def get_nipype_gitversion():

nipype/interfaces/fsl/tests/test_auto_Eddy.py

+10-4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
def test_Eddy_inputs():
77
input_map = dict(
88
args=dict(argstr='%s', ),
9+
cnr_maps=dict(
10+
argstr='--cnr_maps',
11+
min_ver='5.0.10',
12+
),
913
dont_peas=dict(argstr='--dont_peas', ),
1014
dont_sep_offs_move=dict(argstr='--dont_sep_offs_move', ),
1115
environ=dict(
@@ -71,11 +75,13 @@ def test_Eddy_inputs():
7175
),
7276
output_type=dict(),
7377
repol=dict(argstr='--repol', ),
78+
residuals=dict(
79+
argstr='--residuals',
80+
min_ver='5.0.10',
81+
),
7482
session=dict(argstr='--session=%s', ),
7583
slm=dict(argstr='--slm=%s', ),
7684
use_cuda=dict(),
77-
cnr_maps=dict(argstr='--cnr_maps', min_ver='5.0.10', ),
78-
residuals=dict(argstr='--residuals', min_ver='5.0.10', ),
7985
)
8086
inputs = Eddy.input_spec()
8187

@@ -84,15 +90,15 @@ def test_Eddy_inputs():
8490
assert getattr(inputs.traits()[key], metakey) == value
8591
def test_Eddy_outputs():
8692
output_map = dict(
93+
out_cnr_maps=dict(),
8794
out_corrected=dict(),
8895
out_movement_rms=dict(),
8996
out_outlier_report=dict(),
9097
out_parameter=dict(),
98+
out_residuals=dict(),
9199
out_restricted_movement_rms=dict(),
92100
out_rotated_bvecs=dict(),
93101
out_shell_alignment_parameters=dict(),
94-
out_cnr_maps=dict(),
95-
out_residuals=dict(),
96102
)
97103
outputs = Eddy.output_spec()
98104

0 commit comments

Comments
 (0)