Skip to content

Commit

Permalink
Merge tag '20.0.2'
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
effigies committed Mar 11, 2020
2 parents 1d93d9e + c40fb5b commit 624baf3
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Asier Erramuzpe <asier.erramuzpe@gmail.com>
Basille Pinsard <basile.pinsard@umontreal.ca>
Basille Pinsard <basile.pinsard@umontreal.ca> basile <basile.pinsard@gmail.com>
Basille Pinsard <basile.pinsard@umontreal.ca> <bpinsard@imed.jussieu.fr>
Blaise Frederick <blaise.frederick@gmail.com>
Blaise Frederick <blaise.frederick@gmail.com> bbfrederick <blaise.frederick@gmail.com>
Christopher J. Markiewicz <effigies@gmail.com>
Christopher J. Markiewicz <effigies@gmail.com> <effigies@bu.edu>
Christopher J. Markiewicz <effigies@gmail.com> <markiewicz@stanford.edu>
Expand Down
6 changes: 6 additions & 0 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@
"orcid": "0000-0001-7644-7915",
"type": "Researcher"
},
{
"affiliation": "McLean Hospital Brain Imaging Center, MA, USA",
"name": "Frederick, Blaise B.",
"orcid": "0000-0001-5832-5279",
"type": "Researcher"
},
{
"affiliation": "Department of Psychiatry, McGill University",
"name": "Devenyi, Grabriel A.",
Expand Down
14 changes: 14 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
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)

20.0.1 (February 27, 2020)
==========================
Bug-fix release in 20.0.x series.
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ classifiers =
python_requires = >=3.7
install_requires =
indexed_gzip >= 0.8.8
nibabel >= 3.0.1
nipype >= 1.3.1
nibabel ~= 3.0
nipype ~= 1.4.0
nitime
niworkflows @ git+https://github.com/nipreps/niworkflows.git@76f831f1f8fbf6c277fdf92535639bbf11d84527
numpy
Expand Down
7 changes: 5 additions & 2 deletions wrapper/fmriprep_docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -427,9 +427,12 @@ def main():
spaces = []
for space in opts.output_spaces:
if space.split(':')[0] not in (TF_TEMPLATES + NONSTANDARD_REFERENCES):
target = '/imports/' + os.path.basename(space)
tpl = os.path.basename(space)
if not tpl.startswith('tpl-'):
raise RuntimeError("Custom template %s requires a `tpl-` prefix" % tpl)
target = '/home/fmriprep/.cache/templateflow/' + tpl
command.extend(['-v', ':'.join((os.path.abspath(space), target, 'ro'))])
spaces.append(target)
spaces.append(tpl[4:])
else:
spaces.append(space)
unknown_args.extend(['--output-spaces'] + spaces)
Expand Down

0 comments on commit 624baf3

Please sign in to comment.