Skip to content

Commit 624baf3

Browse files
committed
Merge tag '20.0.2'
Merge notes: * Fix gh-2014 appears to have been made unnecessary by gh-2018. Tag message: 20.0.2 (March 6, 2020) ====================== A bug squashing release in the 20.0.x series. This release fixes the use of custom templates within the docker wrapper, remedies crashes when FreeSurfer HOME was not set, and improves the documentation for local installations. With thanks to Blaise Frederick for the contribution. * DOC: Update standalone installation requirements (#2009) * FIX: Crashes whenever FREESURFER_HOME is not set (#2014) * FIX: Local template mounting (wrapper) (#2020) * MAINT: Pin minor series of nipype, major series of nibabel (#2021)
2 parents 1d93d9e + c40fb5b commit 624baf3

File tree

5 files changed

+29
-4
lines changed

5 files changed

+29
-4
lines changed

.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Asier Erramuzpe <[email protected]>
77
Basille Pinsard <[email protected]>
88
Basille Pinsard <[email protected]> basile <[email protected]>
99
10+
Blaise Frederick <[email protected]>
11+
Blaise Frederick <[email protected]> bbfrederick <[email protected]>
1012
Christopher J. Markiewicz <[email protected]>
1113
Christopher J. Markiewicz <[email protected]> <[email protected]>
1214
Christopher J. Markiewicz <[email protected]> <[email protected]>

.zenodo.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@
7474
"orcid": "0000-0001-7644-7915",
7575
"type": "Researcher"
7676
},
77+
{
78+
"affiliation": "McLean Hospital Brain Imaging Center, MA, USA",
79+
"name": "Frederick, Blaise B.",
80+
"orcid": "0000-0001-5832-5279",
81+
"type": "Researcher"
82+
},
7783
{
7884
"affiliation": "Department of Psychiatry, McGill University",
7985
"name": "Devenyi, Grabriel A.",

CHANGES.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
20.0.2 (March 6, 2020)
2+
======================
3+
A bug squashing release in the 20.0.x series.
4+
5+
This release fixes the use of custom templates within the docker wrapper, remedies crashes
6+
when FreeSurfer HOME was not set, and improves the documentation for local installations.
7+
8+
With thanks to Blaise Frederick for the contribution.
9+
10+
* DOC: Update standalone installation requirements (#2009)
11+
* FIX: Crashes whenever FREESURFER_HOME is not set (#2014)
12+
* FIX: Local template mounting (wrapper) (#2020)
13+
* MAINT: Pin minor series of nipype, major series of nibabel (#2021)
14+
115
20.0.1 (February 27, 2020)
216
==========================
317
Bug-fix release in 20.0.x series.

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ classifiers =
2020
python_requires = >=3.7
2121
install_requires =
2222
indexed_gzip >= 0.8.8
23-
nibabel >= 3.0.1
24-
nipype >= 1.3.1
23+
nibabel ~= 3.0
24+
nipype ~= 1.4.0
2525
nitime
2626
niworkflows @ git+https://github.com/nipreps/niworkflows.git@76f831f1f8fbf6c277fdf92535639bbf11d84527
2727
numpy

wrapper/fmriprep_docker.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,9 +427,12 @@ def main():
427427
spaces = []
428428
for space in opts.output_spaces:
429429
if space.split(':')[0] not in (TF_TEMPLATES + NONSTANDARD_REFERENCES):
430-
target = '/imports/' + os.path.basename(space)
430+
tpl = os.path.basename(space)
431+
if not tpl.startswith('tpl-'):
432+
raise RuntimeError("Custom template %s requires a `tpl-` prefix" % tpl)
433+
target = '/home/fmriprep/.cache/templateflow/' + tpl
431434
command.extend(['-v', ':'.join((os.path.abspath(space), target, 'ro'))])
432-
spaces.append(target)
435+
spaces.append(tpl[4:])
433436
else:
434437
spaces.append(space)
435438
unknown_args.extend(['--output-spaces'] + spaces)

0 commit comments

Comments
 (0)