Skip to content

Commit eda5f4a

Browse files
effigieseffigies
authored
Merge pull request #2511 from mgxd/rel/1.0.2
REL: 1.0.2
2 parents 31a1cde + 41baf0f commit eda5f4a

File tree

6 files changed

+80
-55
lines changed

6 files changed

+80
-55
lines changed

‎.zenodo.json

+46-46
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
"name": "Ellis, David Gage",
2121
"orcid": "0000-0002-3718-6836"
2222
},
23-
{
24-
"affiliation": "The Laboratory for Investigative Neurophysiology (The LINE), Department of Radiology and Department of Clinical Neurosciences, Lausanne, Switzerland; Center for Biomedical Imaging (CIBM), Lausanne, Switzerland",
25-
"name": "Notter, Michael Philipp",
26-
"orcid": "0000-0002-5866-047X"
27-
},
2823
{
2924
"affiliation": "Stanford University",
3025
"name": "Markiewicz, Christopher J.",
3126
"orcid": "0000-0002-6533-164X"
3227
},
28+
{
29+
"affiliation": "The Laboratory for Investigative Neurophysiology (The LINE), Department of Radiology and Department of Clinical Neurosciences, Lausanne, Switzerland; Center for Biomedical Imaging (CIBM), Lausanne, Switzerland",
30+
"name": "Notter, Michael Philipp",
31+
"orcid": "0000-0002-5866-047X"
32+
},
3333
{
3434
"affiliation": "University of Iowa",
3535
"name": "Johnson, Hans",
@@ -105,11 +105,6 @@
105105
"name": "Dayan, Michael",
106106
"orcid": "0000-0002-2666-0969"
107107
},
108-
{
109-
"affiliation": "UC Berkeley - UCSF Graduate Program in Bioengineering",
110-
"name": "Keshavan, Anisha",
111-
"orcid": "0000-0003-3554-043X"
112-
},
113108
{
114109
"affiliation": "UC Berkeley",
115110
"name": "Clark, Dav",
@@ -120,6 +115,11 @@
120115
"name": "Visconti di Oleggio Castello, Matteo",
121116
"orcid": "0000-0001-7931-5272"
122117
},
118+
{
119+
"affiliation": "UC Berkeley - UCSF Graduate Program in Bioengineering",
120+
"name": "Keshavan, Anisha",
121+
"orcid": "0000-0003-3554-043X"
122+
},
123123
{
124124
"affiliation": "CNRS LTCI, Telecom ParisTech, Universit\u00e9 Paris-Saclay",
125125
"name": "Gramfort, Alexandre",
@@ -156,14 +156,18 @@
156156
"name": "Rokem, Ariel",
157157
"orcid": "0000-0003-0679-1985"
158158
},
159+
{
160+
"name": "Moloney, Brendan"
161+
},
162+
{
163+
"affiliation": "Molecular Imaging Research Center, CEA, France",
164+
"name": "Bougacha, Salma"
165+
},
159166
{
160167
"affiliation": "Athena EPI, Inria Sophia-Antipolis",
161168
"name": "Wassermann , Demian",
162169
"orcid": "0000-0001-5194-6056"
163170
},
164-
{
165-
"name": "Moloney, Brendan"
166-
},
167171
{
168172
"affiliation": "Dartmouth College: Hanover, NH, United States",
169173
"name": "Halchenko, Yaroslav O.",
@@ -179,10 +183,6 @@
179183
"name": "Horea, Christian",
180184
"orcid": "0000-0001-7037-2449"
181185
},
182-
{
183-
"affiliation": "Molecular Imaging Research Center, CEA, France",
184-
"name": "Bougacha, Salma"
185-
},
186186
{
187187
"affiliation": "MIT",
188188
"name": "Kaczmarzyk, Jakub",
@@ -193,6 +193,16 @@
193193
"name": "Gilles de Hollander",
194194
"orcid": "0000-0003-1988-5091"
195195
},
196+
{
197+
"affiliation": "Montreal Neurological Institute and Hospital",
198+
"name": "DuPre, Elizabeth",
199+
"orcid": "0000-0003-1358-196X"
200+
},
201+
{
202+
"affiliation": "Australian eHealth Research Centre, Commonwealth Scientific and Industrial Research Organisation; University of Queensland",
203+
"name": "Gillman, Ashley",
204+
"orcid": "0000-0001-9130-1092"
205+
},
196206
{
197207
"name": "Mordom, David"
198208
},
@@ -229,11 +239,6 @@
229239
"name": "Malone, Ian B.",
230240
"orcid": "0000-0001-7512-7856"
231241
},
232-
{
233-
"affiliation": "Montreal Neurological Institute and Hospital",
234-
"name": "DuPre, Elizabeth",
235-
"orcid": "0000-0003-1358-196X"
236-
},
237242
{
238243
"name": "Dubois, Mathieu"
239244
},
@@ -259,11 +264,6 @@
259264
"name": "Huntenburg, Julia M.",
260265
"orcid": "0000-0003-0579-9811"
261266
},
262-
{
263-
"affiliation": "University College London",
264-
"name": "Eshaghi, Arman",
265-
"orcid": "0000-0002-6652-3512"
266-
},
267267
{
268268
"affiliation": "Harvard University - Psychology",
269269
"name": "Kastman, Erik",
@@ -274,6 +274,11 @@
274274
"name": "Nichols, B. Nolan",
275275
"orcid": "0000-0003-1099-3328"
276276
},
277+
{
278+
"affiliation": "University College London",
279+
"name": "Eshaghi, Arman",
280+
"orcid": "0000-0002-6652-3512"
281+
},
277282
{
278283
"name": "Ginsburg, Daniel"
279284
},
@@ -290,11 +295,6 @@
290295
{
291296
"name": "Kent, James"
292297
},
293-
{
294-
"affiliation": "Australian eHealth Research Centre, Commonwealth Scientific and Industrial Research Organisation; University of Queensland",
295-
"name": "Gillman, Ashley",
296-
"orcid": "0000-0001-9130-1092"
297-
},
298298
{
299299
"affiliation": "Child Mind Institute",
300300
"name": "Giavasis, Steven"
@@ -356,6 +356,11 @@
356356
"name": "Kahn, Ari E.",
357357
"orcid": "0000-0002-2127-0507"
358358
},
359+
{
360+
"affiliation": "University College London",
361+
"name": "P\u00e9rez-Garc\u00eda, Fernando",
362+
"orcid": "0000-0001-9090-3024"
363+
},
359364
{
360365
"affiliation": "Department of Psychology, Stanford University",
361366
"name": "Triplett, William",
@@ -384,9 +389,6 @@
384389
{
385390
"name": "Salvatore, John"
386391
},
387-
{
388-
"name": "Mertz, Fred"
389-
},
390392
{
391393
"name": "Park, Anne"
392394
},
@@ -409,11 +411,6 @@
409411
{
410412
"name": "Hinds, Oliver"
411413
},
412-
{
413-
"affiliation": "Technical University Munich",
414-
"name": "Molina-Romero, Miguel",
415-
"orcid": "0000-0001-8054-0426"
416-
},
417414
{
418415
"affiliation": "University of Newcastle, Australia",
419416
"name": "Cooper, Gavin",
@@ -467,6 +464,9 @@
467464
"name": "Durnez, Joke",
468465
"orcid": "0000-0001-9030-2202"
469466
},
467+
{
468+
"name": "Mertz, Fred"
469+
},
470470
{
471471
"affiliation": "Technische Universit\u00e4t Dresden, Faculty of Medicine, Department of Child and Adolescent Psychiatry",
472472
"name": "Geisler, Daniel",
@@ -476,14 +476,15 @@
476476
"affiliation": "The University of Texas at Austin",
477477
"name": "Floren, Andrew",
478478
"orcid": "0000-0003-3618-2056"
479-
},
479+
},
480480
{
481481
"affiliation": "University of illinois urbana champaign",
482482
"name": "Sharp, Paul"
483483
},
484484
{
485-
"affiliation": "Vrije Universiteit Amsterdam",
486-
"name": "Ort, Eduard"
485+
"affiliation": "Technical University Munich",
486+
"name": "Molina-Romero, Miguel",
487+
"orcid": "0000-0001-8054-0426"
487488
},
488489
{
489490
"name": "Weinstein, Alejandro"
@@ -558,9 +559,8 @@
558559
"name": "Flandin, Guillaume"
559560
},
560561
{
561-
"affiliation": "University College London",
562-
"name": "P\u00e9rez-Garc\u00eda, Fernando",
563-
"orcid": "0000-0001-9090-3024"
562+
"affiliation": "Vrije Universiteit Amsterdam",
563+
"name": "Ort, Eduard"
564564
},
565565
{
566566
"name": "Shachnev, Dmitry"

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

+23
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
1.0.2 (March 27, 2018)
2+
======================
3+
4+
###### [Full changelog](https://github.com/nipy/nipype/milestone/16?closed=1)
5+
6+
* FIX: dcm2niix interface (https://github.com/nipy/nipype/pull/2498)
7+
* FIX: mark .niml.dset as special extension in utils.filemanip (https://github.com/nipy/nipype/pull/2495)
8+
* FIX: handle automatic module creation, name extraction, default value (https://github.com/nipy/nipype/pull/2490)
9+
* FIX: Check and report mount table parsing failures (https://github.com/nipy/nipype/pull/2476)
10+
* FIX: Check against full node name when reconnecting JoinNodes (https://github.com/nipy/nipype/pull/2479)
11+
* DOC: Add tutorials, porcupine to users TOC (https://github.com/nipy/nipype/pull/2503
12+
* DOC: Contributing and testing (https://github.com/nipy/nipype/pull/2482)
13+
* DOC: Describe 'orphaned' tag in CONTRIBUTING (https://github.com/nipy/nipype/pull/2481)
14+
* DOC: Add details for dcm2niix output filename pattern (https://github.com/nipy/nipype/pull/2512)
15+
* ENH: Add interface for AFNI 3dNwarpAdjust (https://github.com/nipy/nipype/pull/2450)
16+
* ENH: Update SSHDataGrabber to fetch related files (https://github.com/nipy/nipype/pull/2104)
17+
* ENH: Add interpolation order parameter to NiftyReg's RegTools (https://github.com/nipy/nipype/pull/2471)
18+
* MAINT: Stray warnings and exceptions (https://github.com/nipy/nipype/pull/2478)
19+
* MAINT: Add dev install option, update CONTRIBUTING (https://github.com/nipy/nipype/pull/2477)
20+
* MAINT: Sync requirements with info.py (https://github.com/nipy/nipype/pull/2472)
21+
* CI: Update Travis builds, Docker to use latest miniconda (https://github.com/nipy/nipype/pull/2455)
22+
* TEST: Parallelize pytest (https://github.com/nipy/nipype/pull/2469)
23+
124
1.0.1 (February 27, 2018)
225
=========================
326

‎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.0.1"
85+
release = "1.0.2"
8686

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

‎nipype/algorithms/tests/test_mesh_ops.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def test_ident_distances(tmpdir):
2121
dist_ident = m.ComputeMeshWarp()
2222
dist_ident.inputs.surface1 = in_surf
2323
dist_ident.inputs.surface2 = in_surf
24-
dist_ident.inputs.out_file = tmpdir.join('distance.npy')
24+
dist_ident.inputs.out_file = tmpdir.join('distance.npy').strpath
2525
res = dist_ident.run()
2626
assert res.outputs.distance == 0.0
2727

@@ -35,7 +35,7 @@ def test_trans_distances(tmpdir):
3535
from ...interfaces.vtkbase import tvtk
3636

3737
in_surf = example_data('surf01.vtk')
38-
warped_surf = tmpdir.join('warped.vtk')
38+
warped_surf = tmpdir.join('warped.vtk').strpath
3939

4040
inc = np.array([0.7, 0.3, -0.2])
4141

@@ -51,7 +51,7 @@ def test_trans_distances(tmpdir):
5151
dist = m.ComputeMeshWarp()
5252
dist.inputs.surface1 = in_surf
5353
dist.inputs.surface2 = warped_surf
54-
dist.inputs.out_file = tmpdir.join('distance.npy')
54+
dist.inputs.out_file = tmpdir.join('distance.npy').strpath
5555
res = dist.run()
5656
assert np.allclose(res.outputs.distance, np.linalg.norm(inc), 4)
5757
dist.inputs.weighting = 'area'

‎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.0.2-dev'
14+
__version__ = '1.0.2'
1515

1616

1717
def get_nipype_gitversion():

‎tools/update_changes.sh

+6-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
set -u # Treat unset variables as an error when substituting.
1313
set -x # Print command traces before executing command.
1414

15+
CHANGES=../doc/changelog/1.X.X-changelog
16+
1517
# Check whether the Upcoming release header is present
16-
head -1 CHANGES | grep -q Upcoming
18+
head -1 $CHANGES | grep -q Upcoming
1719
UPCOMING=$?
1820

1921
# Elaborate today's release header
@@ -30,11 +32,11 @@ echo "" >> newchanges
3032
# Append old CHANGES
3133
if [[ "$UPCOMING" == "0" ]]; then
3234
# Drop the Upcoming title if present
33-
tail -n+4 CHANGES >> newchanges
35+
tail -n+4 $CHANGES >> newchanges
3436
else
35-
cat CHANGES >> newchanges
37+
cat $CHANGES >> newchanges
3638
fi
3739

3840
# Replace old CHANGES with new file
39-
mv newchanges CHANGES
41+
mv newchanges $CHANGES
4042

0 commit comments

Comments
 (0)