Skip to content

Commit 58a7bc0

Browse files
effigieseffigies
authored
Merge pull request nipy#2760 from nipy/rel/1.1.4
REL: 1.1.4
2 parents a2519fc + 9daa092 commit 58a7bc0

File tree

9 files changed

+167
-52
lines changed

9 files changed

+167
-52
lines changed

‎.zenodo.json‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,20 @@
7474
"affiliation": "Department of Psychology, Stanford University",
7575
"name": "Waskom, Michael"
7676
},
77-
{
78-
"affiliation": "Developer",
79-
"name": "Clark, Daniel",
80-
"orcid": "0000-0002-8121-8954"
81-
},
8277
{
8378
"affiliation": "Shattuck Lab, UCLA Brain Mapping Center",
8479
"name": "Wong, Jason"
8580
},
81+
{
82+
"name": "Modat, Marc"
83+
},
8684
{
8785
"name": "Loney, Fred"
8886
},
8987
{
90-
"name": "Modat, Marc"
88+
"affiliation": "Developer",
89+
"name": "Clark, Daniel",
90+
"orcid": "0000-0002-8121-8954"
9191
},
9292
{
9393
"affiliation": "Department of Electrical and Computer Engineering, Johns Hopkins University",
@@ -141,16 +141,6 @@
141141
{
142142
"name": "Berleant, Shoshana"
143143
},
144-
{
145-
"affiliation": "MIT",
146-
"name": "Kaczmarzyk, Jakub",
147-
"orcid": "0000-0002-5544-7577"
148-
},
149-
{
150-
"affiliation": "INRIA",
151-
"name": "Varoquaux, Gael",
152-
"orcid": "0000-0003-1076-5122"
153-
},
154144
{
155145
"affiliation": "UC San Diego",
156146
"name": "Cipollini, Ben",
@@ -176,9 +166,24 @@
176166
"name": "DuPre, Elizabeth",
177167
"orcid": "0000-0003-1358-196X"
178168
},
169+
{
170+
"affiliation": "MIT",
171+
"name": "Kaczmarzyk, Jakub",
172+
"orcid": "0000-0002-5544-7577"
173+
},
179174
{
180175
"name": "Moloney, Brendan"
181176
},
177+
{
178+
"affiliation": "INRIA",
179+
"name": "Varoquaux, Gael",
180+
"orcid": "0000-0003-1076-5122"
181+
},
182+
{
183+
"affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
184+
"name": "Horea, Christian",
185+
"orcid": "0000-0001-7037-2449"
186+
},
182187
{
183188
"affiliation": "Athena EPI, Inria Sophia-Antipolis",
184189
"name": "Wassermann , Demian",
@@ -189,11 +194,6 @@
189194
"name": "Hanke, Michael",
190195
"orcid": "0000-0001-6398-6370"
191196
},
192-
{
193-
"affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
194-
"name": "Horea, Christian",
195-
"orcid": "0000-0001-7037-2449"
196-
},
197197
{
198198
"affiliation": "Vrije Universiteit, Amsterdam",
199199
"name": "Gilles de Hollander",
@@ -268,11 +268,6 @@
268268
{
269269
"name": "Cumba, Chad"
270270
},
271-
{
272-
"affiliation": "Harvard University - Psychology",
273-
"name": "Kastman, Erik",
274-
"orcid": "0000-0001-7221-9042"
275-
},
276271
{
277272
"affiliation": "SRI International",
278273
"name": "Nichols, B. Nolan",
@@ -283,6 +278,11 @@
283278
"name": "Eshaghi, Arman",
284279
"orcid": "0000-0002-6652-3512"
285280
},
281+
{
282+
"affiliation": "Harvard University - Psychology",
283+
"name": "Kastman, Erik",
284+
"orcid": "0000-0001-7221-9042"
285+
},
286286
{
287287
"name": "Ginsburg, Daniel"
288288
},
@@ -297,8 +297,9 @@
297297
"orcid": "0000-0001-6392-6634"
298298
},
299299
{
300-
"affiliation": "Child Mind Institute",
301-
"name": "Giavasis, Steven"
300+
"affiliation": "University of Zurich",
301+
"name": "Liem, Franz",
302+
"orcid": "0000-0003-0646-4810"
302303
},
303304
{
304305
"affiliation": "UniversityHospital Heidelberg, Germany",
@@ -308,7 +309,8 @@
308309
"name": "Erickson, Drew"
309310
},
310311
{
311-
"name": "K\u00fcttner, Ren\u00e9"
312+
"affiliation": "Child Mind Institute",
313+
"name": "Giavasis, Steven"
312314
},
313315
{
314316
"name": "Haselgrove, Christian"
@@ -320,9 +322,7 @@
320322
"name": "Ghayoor, Ali"
321323
},
322324
{
323-
"affiliation": "University of Zurich",
324-
"name": "Liem, Franz",
325-
"orcid": "0000-0003-0646-4810"
325+
"name": "K\u00fcttner, Ren\u00e9"
326326
},
327327
{
328328
"name": "Millman, Jarrod"
@@ -385,10 +385,6 @@
385385
"name": "Chetverikov, Andrey",
386386
"orcid": "0000-0003-2767-6310"
387387
},
388-
{
389-
"affiliation": "Institute of Imaging & Computer Vision, RWTH Aachen University, Germany",
390-
"name": "Weninger, Leon"
391-
},
392388
{
393389
"name": "Salvatore, John"
394390
},
@@ -403,9 +399,6 @@
403399
"name": "Craddock, R. Cameron",
404400
"orcid": "0000-0002-4950-1303"
405401
},
406-
{
407-
"name": "Inati, Souheil"
408-
},
409402
{
410403
"name": "Hinds, Oliver"
411404
},
@@ -414,6 +407,13 @@
414407
"name": "Cooper, Gavin",
415408
"orcid": "0000-0002-7186-5293"
416409
},
410+
{
411+
"affiliation": "Institute of Imaging & Computer Vision, RWTH Aachen University, Germany",
412+
"name": "Weninger, Leon"
413+
},
414+
{
415+
"name": "Inati, Souheil"
416+
},
417417
{
418418
"affiliation": "Boston University",
419419
"name": "Perkins, L. Nathan"
@@ -443,9 +443,6 @@
443443
"name": "Floren, Andrew",
444444
"orcid": "0000-0003-3618-2056"
445445
},
446-
{
447-
"name": "Rothmei, Simon"
448-
},
449446
{
450447
"name": "Urchs, Sebastian"
451448
},
@@ -465,6 +462,11 @@
465462
"name": "Geisler, Daniel",
466463
"orcid": "0000-0003-2076-5329"
467464
},
465+
{
466+
"affiliation": "University of Texas at Austin",
467+
"name": "De La Vega, Alejandro",
468+
"orcid": "0000-0001-9062-3778"
469+
},
468470
{
469471
"affiliation": "University of illinois urbana champaign",
470472
"name": "Sharp, Paul"
@@ -493,6 +495,9 @@
493495
{
494496
"name": "Saase, Victor"
495497
},
498+
{
499+
"name": "Rothmei, Simon"
500+
},
496501
{
497502
"affiliation": "University of Helsinki",
498503
"name": "Andberg, Sami Kristian",
@@ -518,11 +523,6 @@
518523
{
519524
"name": "Tarbert, Claire"
520525
},
521-
{
522-
"affiliation": "University of Texas at Austin",
523-
"name": "De La Vega, Alejandro",
524-
"orcid": "0000-0001-9062-3778"
525-
},
526526
{
527527
"affiliation": "Vrije Universiteit Amsterdam",
528528
"name": "Ort, Eduard"

‎doc/changelog/1.X.X-changelog‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
1.1.4 (October 31, 2018)
2+
========================
3+
4+
##### [Full changelog](https://github.com/nipy/nipype/milestone/25?closed=1)
5+
6+
* FIX: Python 2.7-3.7.1 compatible NonDaemonPool (https://github.com/nipy/nipype/pull/2754)
7+
* FIX: VRML typo (VMRL) in MeshFix (https://github.com/nipy/nipype/pull/2757)
8+
* FIX: Refine FSL.split output identification (https://github.com/nipy/nipype/pull/2746)
9+
* FIX: Reuse _gen_filename logic in ants.LaplacianThickness (https://github.com/nipy/nipype/pull/2734)
10+
* FIX: Remove 'reg_term' default from dwi2tensor interface (https://github.com/nipy/nipype/pull/2731)
11+
* FIX: Keep profile files when ``remove_unnecessary_outputs = true`` (https://github.com/nipy/nipype/pull/2718)
12+
* ENH: Add afni.LocalStat and afni.ReHo, update afni.ROIStats inputs (https://github.com/nipy/nipype/pull/2740)
13+
* ENH: Add compression option for bru2nii (https://github.com/nipy/nipype/pull/2762)
14+
* ENH: Add slice_encoding_direction input to TShift (https://github.com/nipy/nipype/pull/2753)
15+
* ENH: Add 'sse' output to FSL DTIFit interface (https://github.com/nipy/nipype/pull/2749)
16+
* ENH: Update ``ants.LaplacianThickness`` to use ``name_source`` (https://github.com/nipy/nipype/pull/2747)
17+
* ENH: Add tab completion for node and interface inputs properties (https://github.com/nipy/nipype/pull/2735)
18+
* ENH: enable/disable resource monitor in the fixture per test (https://github.com/nipy/nipype/pull/2725)
19+
* TEST: Update expected dotfile text for networkx 1.x (https://github.com/nipy/nipype/pull/2730)
20+
* DOC: Move user docs from nipype to nipype_tutorial (https://github.com/nipy/nipype/pull/2726)
21+
* DOC: Use consistent name in reconall workflow docstring (https://github.com/nipy/nipype/pull/2758)
22+
* MAINT: Use neurodocker 0.4.1 + apt install afni (https://github.com/nipy/nipype/pull/2707)
23+
* MAINT: Fix prov and rdflib in nipype (https://github.com/nipy/nipype/pull/2701)
24+
* MAINT: Correct readthedocs build error (https://github.com/nipy/nipype/pull/2723)
25+
* MAINT: Pin codecov to <5.0 so Travis is fixed (https://github.com/nipy/nipype/pull/2728)
26+
* CI: Lock travis pybids 0.6.5 (https://github.com/nipy/nipype/pull/2720)
27+
28+
129
1.1.3 (September 24, 2018)
230
==========================
331

‎doc/conf.py‎

Lines changed: 1 addition & 1 deletion
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.3"
85+
release = "1.1.4"
8686

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

‎nipype/info.py‎

Lines changed: 1 addition & 1 deletion
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.4-dev'
14+
__version__ = '1.1.4'
1515

1616

1717
def get_nipype_gitversion():

‎nipype/interfaces/afni/tests/test_auto_TShift.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ def test_TShift_inputs():
3030
outputtype=dict(),
3131
rlt=dict(argstr='-rlt', ),
3232
rltplus=dict(argstr='-rlt+', ),
33+
slice_encoding_direction=dict(usedefault=True, ),
3334
slice_timing=dict(
3435
argstr='-tpattern @%s',
3536
xor=['tpattern'],

‎nipype/interfaces/ants/tests/test_auto_AntsJointFusion.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ def test_AntsJointFusion_inputs():
5252
hash_files=False,
5353
),
5454
out_label_post_prob_name_format=dict(
55-
requires=['out_label_fusion', 'out_intensity_fusion_name_format'],
56-
),
55+
requires=['out_label_fusion',
56+
'out_intensity_fusion_name_format'], ),
5757
patch_metric=dict(argstr='-m %s', ),
5858
patch_radius=dict(
5959
argstr='-p %s',

‎nipype/interfaces/dipy/tests/test_auto_DTI.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ def test_DTI_inputs():
2020
def test_DTI_outputs():
2121
output_map = dict(
2222
ad_file=dict(),
23+
color_fa_file=dict(),
2324
fa_file=dict(),
2425
md_file=dict(),
2526
out_file=dict(),

‎nipype/interfaces/fsl/tests/test_auto_DTIFit.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ def test_DTIFit_outputs():
6565
V1=dict(),
6666
V2=dict(),
6767
V3=dict(),
68-
tensor=dict(),
6968
sse=dict(),
69+
tensor=dict(),
7070
)
7171
outputs = DTIFit.output_spec()
7272

‎nipype/interfaces/spm/tests/test_auto_RealignUnwarp.py‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
2+
from __future__ import unicode_literals
3+
from ..preprocess import RealignUnwarp
4+
5+
6+
def test_RealignUnwarp_inputs():
7+
input_map = dict(
8+
est_basis_func=dict(field='uweoptions.basfcn', ),
9+
est_first_order_effects=dict(field='uweoptions.fot', ),
10+
est_jacobian_deformations=dict(field='uweoptions.jm', ),
11+
est_num_of_interations=dict(
12+
field='uweoptions.noi',
13+
maxlen=1,
14+
minlen=1,
15+
usedfault=True,
16+
),
17+
est_re_est_mov_par=dict(field='uweoptions.rem', ),
18+
est_reg_factor=dict(
19+
field='uweoptions.lambda',
20+
maxlen=1,
21+
minlen=1,
22+
usedefault=True,
23+
),
24+
est_reg_order=dict(field='uweoptions.regorder', ),
25+
est_second_order_effects=dict(field='uweoptions.sot', ),
26+
est_taylor_expansion_point=dict(
27+
field='uweoptions.expround',
28+
usedefault=True,
29+
),
30+
est_unwarp_fwhm=dict(field='uweoptions.uwfwhm', ),
31+
fwhm=dict(field='eoptions.fwhm', ),
32+
in_files=dict(
33+
copyfile=True,
34+
field='data.scans',
35+
mandatory=True,
36+
),
37+
interp=dict(field='eoptions.einterp', ),
38+
matlab_cmd=dict(),
39+
mfile=dict(usedefault=True, ),
40+
out_prefix=dict(
41+
field='uwroptions.prefix',
42+
usedefault=True,
43+
),
44+
paths=dict(),
45+
phase_map=dict(
46+
copyfile=False,
47+
field='data.pmscan',
48+
),
49+
quality=dict(field='eoptions.quality', ),
50+
register_to_mean=dict(field='eoptions.rtm', ),
51+
reslice_interp=dict(field='uwroptions.rinterp', ),
52+
reslice_mask=dict(field='uwroptions.mask', ),
53+
reslice_which=dict(
54+
field='uwroptions.uwwhich',
55+
maxlen=2,
56+
minlen=2,
57+
usedefault=True,
58+
),
59+
reslice_wrap=dict(field='uwroptions.wrap', ),
60+
separation=dict(field='eoptions.sep', ),
61+
use_mcr=dict(),
62+
use_v8struct=dict(
63+
min_ver='8',
64+
usedefault=True,
65+
),
66+
weight_img=dict(field='eoptions.weight', ),
67+
wrap=dict(field='eoptions.ewrap', ),
68+
)
69+
inputs = RealignUnwarp.input_spec()
70+
71+
for key, metadata in list(input_map.items()):
72+
for metakey, value in list(metadata.items()):
73+
assert getattr(inputs.traits()[key], metakey) == value
74+
def test_RealignUnwarp_outputs():
75+
output_map = dict(
76+
mean_image=dict(),
77+
modified_in_files=dict(),
78+
realigned_unwarped_files=dict(),
79+
realignment_parameters=dict(),
80+
)
81+
outputs = RealignUnwarp.output_spec()
82+
83+
for key, metadata in list(output_map.items()):
84+
for metakey, value in list(metadata.items()):
85+
assert getattr(outputs.traits()[key], metakey) == value

0 commit comments

Comments
 (0)