Skip to content

Commit

Permalink
Merge pull request #1707 from oesteban/maint/pybids-0.9.x-extensions
Browse files Browse the repository at this point in the history
MAINT: Remove old ``extensions`` entity selector for pybids queries
  • Loading branch information
effigies authored Jul 23, 2019
2 parents 0821e64 + 7654187 commit 7962a6d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion fmriprep/cli/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ def main():
if opts.run_reconall:
from templateflow import api
from niworkflows.utils.misc import _copy_any
dseg_tsv = str(api.get('fsaverage', suffix='dseg', extensions=['.tsv']))
dseg_tsv = str(api.get('fsaverage', suffix='dseg', extension=['.tsv']))
_copy_any(dseg_tsv,
str(output_dir / 'fmriprep' / 'desc-aseg_dseg.tsv'))
_copy_any(dseg_tsv,
Expand Down
3 changes: 2 additions & 1 deletion fmriprep/workflows/bold/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,8 @@ def init_func_preproc_wf(
# Find associated sbref, if possible
entities = layout.parse_file_entities(ref_file)
entities['suffix'] = 'sbref'
files = layout.get(return_type='file', extensions=['nii', 'nii.gz'], **entities)
entities['extension'] = ['nii', 'nii.gz'] # Overwrite extensions
files = layout.get(return_type='file', **entities)
refbase = os.path.basename(ref_file)
if 'sbref' in ignore:
LOGGER.info("Single-band reference files ignored.")
Expand Down
2 changes: 1 addition & 1 deletion fmriprep/workflows/bold/confounds.py
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ def init_carpetplot_wf(standard_spaces, mem_gb, metadata, name="bold_carpet_wf")
float=True,
input_image=str(get_template(
'MNI152NLin2009cAsym', resolution=1, desc='carpet',
suffix='dseg', extensions=['.nii', '.nii.gz'])),
suffix='dseg', extension=['.nii', '.nii.gz'])),
dimension=3, default_value=0, interpolation='MultiLabel'),
name='resample_parc')

Expand Down
6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ classifiers =
[options]
python_requires = >=3.5
install_requires =
niworkflows ~= 0.10.0
smriprep ~= 0.3.0
templateflow ~= 0.4.1rc1
niworkflows ~= 0.10.1
smriprep ~= 0.3.1
templateflow ~= 0.4.1
nibabel >=2.2.1
indexed_gzip >=0.8.8
nilearn !=0.5.0, !=0.5.1
Expand Down

0 comments on commit 7962a6d

Please sign in to comment.