Skip to content

Commit f700e0c

Browse files
mgxdmgxd
authored
FIX: Bump niworkflows, ensure consistent collect_data signature (#208)
* FIX: Bump niworkflows, ensure consistent `collect_data` signature * FIX: Update outputs to reflect run-padding
1 parent 6337a93 commit f700e0c

File tree

4 files changed

+83
-83
lines changed

4 files changed

+83
-83
lines changed

‎.circleci/bcp_anat_outputs.txt‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,33 @@ sub-01
1111
sub-01.html
1212
sub-01/ses-1mo
1313
sub-01/ses-1mo/anat
14-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_desc-aparcaseg_dseg.nii.gz
15-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_desc-aseg_dseg.nii.gz
16-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_desc-brain_mask.json
17-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_desc-brain_mask.nii.gz
18-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_desc-preproc_T1w.json
19-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_desc-preproc_T1w.nii.gz
20-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_dseg.nii.gz
21-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_from-fsnative_to-T1w_mode-image_xfm.txt
22-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_from-MNIInfant+1_to-T1w_mode-image_xfm.h5
23-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_from-T1w_to-fsnative_mode-image_xfm.txt
24-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_from-T1w_to-MNIInfant+1_mode-image_xfm.h5
25-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-L_inflated.surf.gii
26-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-L_midthickness.surf.gii
27-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-L_pial.surf.gii
28-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-L_smoothwm.surf.gii
29-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-R_inflated.surf.gii
30-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-R_midthickness.surf.gii
31-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-R_pial.surf.gii
32-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-R_smoothwm.surf.gii
33-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_label-CSF_probseg.nii.gz
34-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_label-GM_probseg.nii.gz
35-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_label-WM_probseg.nii.gz
36-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_desc-brain_mask.json
37-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_desc-brain_mask.nii.gz
38-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_desc-preproc_T1w.json
39-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_desc-preproc_T1w.nii.gz
40-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_dseg.nii.gz
41-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_label-CSF_probseg.nii.gz
42-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_label-GM_probseg.nii.gz
43-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_label-WM_probseg.nii.gz
14+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_desc-aparcaseg_dseg.nii.gz
15+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_desc-aseg_dseg.nii.gz
16+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_desc-brain_mask.json
17+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_desc-brain_mask.nii.gz
18+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_desc-preproc_T1w.json
19+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_desc-preproc_T1w.nii.gz
20+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_dseg.nii.gz
21+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_from-fsnative_to-T1w_mode-image_xfm.txt
22+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_from-MNIInfant+1_to-T1w_mode-image_xfm.h5
23+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_from-T1w_to-fsnative_mode-image_xfm.txt
24+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_from-T1w_to-MNIInfant+1_mode-image_xfm.h5
25+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-L_inflated.surf.gii
26+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-L_midthickness.surf.gii
27+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-L_pial.surf.gii
28+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-L_smoothwm.surf.gii
29+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-R_inflated.surf.gii
30+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-R_midthickness.surf.gii
31+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-R_pial.surf.gii
32+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-R_smoothwm.surf.gii
33+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_label-CSF_probseg.nii.gz
34+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_label-GM_probseg.nii.gz
35+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_label-WM_probseg.nii.gz
36+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_desc-brain_mask.json
37+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_desc-brain_mask.nii.gz
38+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_desc-preproc_T1w.json
39+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_desc-preproc_T1w.nii.gz
40+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_dseg.nii.gz
41+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_label-CSF_probseg.nii.gz
42+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_label-GM_probseg.nii.gz
43+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_label-WM_probseg.nii.gz

‎.circleci/bcp_full_outputs.txt‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -11,55 +11,55 @@ sub-01
1111
sub-01.html
1212
sub-01/ses-1mo
1313
sub-01/ses-1mo/anat
14-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_desc-aparcaseg_dseg.nii.gz
15-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_desc-aseg_dseg.nii.gz
16-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_desc-brain_mask.json
17-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_desc-brain_mask.nii.gz
18-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_desc-preproc_T1w.json
19-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_desc-preproc_T1w.nii.gz
20-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_dseg.nii.gz
21-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_from-fsnative_to-T1w_mode-image_xfm.txt
22-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_from-MNIInfant+1_to-T1w_mode-image_xfm.h5
23-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_from-T1w_to-fsnative_mode-image_xfm.txt
24-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_from-T1w_to-MNIInfant+1_mode-image_xfm.h5
25-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-L_inflated.surf.gii
26-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-L_midthickness.surf.gii
27-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-L_pial.surf.gii
28-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-L_smoothwm.surf.gii
29-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-R_inflated.surf.gii
30-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-R_midthickness.surf.gii
31-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-R_pial.surf.gii
32-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_hemi-R_smoothwm.surf.gii
33-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_label-CSF_probseg.nii.gz
34-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_label-GM_probseg.nii.gz
35-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_label-WM_probseg.nii.gz
36-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_desc-brain_mask.json
37-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_desc-brain_mask.nii.gz
38-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_desc-preproc_T1w.json
39-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_desc-preproc_T1w.nii.gz
40-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_dseg.nii.gz
41-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_label-CSF_probseg.nii.gz
42-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_label-GM_probseg.nii.gz
43-
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-1_space-MNIInfant_cohort-1_label-WM_probseg.nii.gz
14+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_desc-aparcaseg_dseg.nii.gz
15+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_desc-aseg_dseg.nii.gz
16+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_desc-brain_mask.json
17+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_desc-brain_mask.nii.gz
18+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_desc-preproc_T1w.json
19+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_desc-preproc_T1w.nii.gz
20+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_dseg.nii.gz
21+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_from-fsnative_to-T1w_mode-image_xfm.txt
22+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_from-MNIInfant+1_to-T1w_mode-image_xfm.h5
23+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_from-T1w_to-fsnative_mode-image_xfm.txt
24+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_from-T1w_to-MNIInfant+1_mode-image_xfm.h5
25+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-L_inflated.surf.gii
26+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-L_midthickness.surf.gii
27+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-L_pial.surf.gii
28+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-L_smoothwm.surf.gii
29+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-R_inflated.surf.gii
30+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-R_midthickness.surf.gii
31+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-R_pial.surf.gii
32+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_hemi-R_smoothwm.surf.gii
33+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_label-CSF_probseg.nii.gz
34+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_label-GM_probseg.nii.gz
35+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_label-WM_probseg.nii.gz
36+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_desc-brain_mask.json
37+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_desc-brain_mask.nii.gz
38+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_desc-preproc_T1w.json
39+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_desc-preproc_T1w.nii.gz
40+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_dseg.nii.gz
41+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_label-CSF_probseg.nii.gz
42+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_label-GM_probseg.nii.gz
43+
sub-01/ses-1mo/anat/sub-01_ses-1mo_run-001_space-MNIInfant_cohort-1_label-WM_probseg.nii.gz
4444
sub-01/ses-1mo/fmap
45-
sub-01/ses-1mo/fmap/sub-01_ses-1mo_run-1_fmapid-auto00000_desc-coeff_fieldmap.nii.gz
46-
sub-01/ses-1mo/fmap/sub-01_ses-1mo_run-1_fmapid-auto00000_desc-epi_fieldmap.nii.gz
47-
sub-01/ses-1mo/fmap/sub-01_ses-1mo_run-1_fmapid-auto00000_desc-preproc_fieldmap.json
48-
sub-01/ses-1mo/fmap/sub-01_ses-1mo_run-1_fmapid-auto00000_desc-preproc_fieldmap.nii.gz
45+
sub-01/ses-1mo/fmap/sub-01_ses-1mo_run-001_fmapid-auto00000_desc-coeff_fieldmap.nii.gz
46+
sub-01/ses-1mo/fmap/sub-01_ses-1mo_run-001_fmapid-auto00000_desc-epi_fieldmap.nii.gz
47+
sub-01/ses-1mo/fmap/sub-01_ses-1mo_run-001_fmapid-auto00000_desc-preproc_fieldmap.json
48+
sub-01/ses-1mo/fmap/sub-01_ses-1mo_run-001_fmapid-auto00000_desc-preproc_fieldmap.nii.gz
4949
sub-01/ses-1mo/func
50-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_boldref.nii.gz
51-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_desc-brain_mask.json
52-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_desc-brain_mask.nii.gz
53-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_desc-confounds_timeseries.json
54-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_desc-confounds_timeseries.tsv
55-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_desc-preproc_bold.json
56-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_desc-preproc_bold.nii.gz
57-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_from-scanner_to-T1w_mode-image_xfm.txt
58-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_from-T1w_to-scanner_mode-image_xfm.txt
59-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_space-MNIInfant_cohort-1_boldref.nii.gz
60-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_space-MNIInfant_cohort-1_desc-aparcaseg_dseg.nii.gz
61-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_space-MNIInfant_cohort-1_desc-aseg_dseg.nii.gz
62-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_space-MNIInfant_cohort-1_desc-brain_mask.json
63-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_space-MNIInfant_cohort-1_desc-brain_mask.nii.gz
64-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_space-MNIInfant_cohort-1_desc-preproc_bold.json
65-
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-1_space-MNIInfant_cohort-1_desc-preproc_bold.nii.gz
50+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_boldref.nii.gz
51+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_desc-brain_mask.json
52+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_desc-brain_mask.nii.gz
53+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_desc-confounds_timeseries.json
54+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_desc-confounds_timeseries.tsv
55+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_desc-preproc_bold.json
56+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_desc-preproc_bold.nii.gz
57+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_from-scanner_to-T1w_mode-image_xfm.txt
58+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_from-T1w_to-scanner_mode-image_xfm.txt
59+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_cohort-1_boldref.nii.gz
60+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_cohort-1_desc-aparcaseg_dseg.nii.gz
61+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_cohort-1_desc-aseg_dseg.nii.gz
62+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_cohort-1_desc-brain_mask.json
63+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_cohort-1_desc-brain_mask.nii.gz
64+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_cohort-1_desc-preproc_bold.json
65+
sub-01/ses-1mo/func/sub-01_ses-1mo_task-rest_acq-PA_run-001_space-MNIInfant_cohort-1_desc-preproc_bold.nii.gz

‎nibabies/workflows/base.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ def init_single_subject_wf(subject_id):
134134
subject_data = collect_data(
135135
config.execution.layout,
136136
subject_id,
137-
config.execution.task_id,
138-
config.execution.echo_idx,
137+
task=config.execution.task_id,
138+
echo=config.execution.echo_idx,
139139
bids_filters=config.execution.bids_filters,
140140
)[0]
141141

‎setup.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ install_requires =
2424
nibabel >= 3.0.1
2525
nipype >= 1.5.1
2626
nitime
27-
niworkflows ~= 1.5.0
27+
niworkflows ~= 1.5.3
2828
numpy >= 1.16.5
2929
pybids >= 0.12.1
3030
sdcflows ~= 2.0.12

0 commit comments

Comments
 (0)