Skip to content

Commit a4a413d

Browse files
effigieseffigies
authored
Final revisions for next branch (#3134)
With the merge of this PR, we will merge `next` into `master` and begin the process of releasing 23.2.0a1. Starting by running without fasttrack to pin down expected results.
2 parents 96bb6dc + 4647b6e commit a4a413d

25 files changed

+785
-797
lines changed

‎.circleci/config.yml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,30 @@ _setup_fmriprep_docker: &setup_fmriprep_docker
8787
pip install --upgrade /tmp/src/fmriprep/wrapper/
8888
8989
_check_outputs: &check_outputs
90-
name: Show outputs of fMRIPrep run
90+
name: Check outputs of fMRIPrep run
9191
command: |
92-
find /tmp/${DATASET}/${SUBDIR:-fmriprep} \( -path '*/figures' -o -path '*/log' -o -path '*/sourcedata' \) -prune -o -name "*" -print | cut -d/ -f 5- | sort
92+
set +e -x
93+
mkdir -p /tmp/${DATASET}/test
94+
find /tmp/${DATASET}/${SUBDIR:-fmriprep} \
95+
\( -path '*/figures' -o -path '*/log' -o -path '*/sourcedata' \) \
96+
-prune -o -name "*" -print | cut -d/ -f 5- | sort > /tmp/${DATASET}/test/outputs.out
97+
98+
FASTTRACK_OUTPUTS="${DATASET}${VARIANT}_fasttrack_outputs.txt"
99+
FULL_OUTPUTS="${DATASET}${VARIANT}_outputs.txt"
100+
RET=1
101+
if [ ! -f /tmp/.nofasttrack ]; then
102+
echo "Checking fasttrack..."
103+
sort /tmp/src/fmriprep/.circleci/${FASTTRACK_OUTPUTS} > /tmp/${DATASET}/test/fasttrack.out
104+
diff /tmp/${DATASET}/test/{fasttrack,outputs}.out
105+
RET=$?
106+
fi
107+
if [ $RET -ne 0 ]; then
108+
echo "Checking full..."
109+
sort /tmp/src/fmriprep/.circleci/${FULL_OUTPUTS} > /tmp/${DATASET}/test/full.out
110+
diff /tmp/${DATASET}/test/{full,outputs}.out
111+
RET=$?
112+
fi
113+
exit $RET
93114
94115
version: 2.1
95116
aliases:

‎.circleci/ds005_bids_outputs.txt

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎.circleci/ds005_fasttrack_outputs.txt

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
2+
.bidsignore
3+
dataset_description.json
4+
desc-aparcaseg_dseg.tsv
5+
desc-aseg_dseg.tsv
6+
logs
7+
logs/CITATION.bib
8+
logs/CITATION.html
9+
logs/CITATION.md
10+
logs/CITATION.tex
11+
sub-01
12+
sub-01/anat
13+
sub-01/anat/sub-01_desc-ribbon_mask.json
14+
sub-01/anat/sub-01_desc-ribbon_mask.nii.gz
15+
sub-01/anat/sub-01_hemi-L_desc-preproc_sphere.surf.gii
16+
sub-01/anat/sub-01_hemi-L_desc-preproc_white.surf.gii
17+
sub-01/anat/sub-01_hemi-L_desc-reg_sphere.surf.gii
18+
sub-01/anat/sub-01_hemi-L_space-fsLR_desc-msmsulc_sphere.surf.gii
19+
sub-01/anat/sub-01_hemi-L_space-fsLR_desc-reg_sphere.surf.gii
20+
sub-01/anat/sub-01_hemi-R_desc-preproc_sphere.surf.gii
21+
sub-01/anat/sub-01_hemi-R_desc-preproc_white.surf.gii
22+
sub-01/anat/sub-01_hemi-R_desc-reg_sphere.surf.gii
23+
sub-01/anat/sub-01_hemi-R_space-fsLR_desc-msmsulc_sphere.surf.gii
24+
sub-01/anat/sub-01_hemi-R_space-fsLR_desc-reg_sphere.surf.gii
25+
sub-01/func
26+
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-brain_mask.json
27+
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-brain_mask.nii.gz
28+
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-confounds_timeseries.json
29+
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-confounds_timeseries.tsv
30+
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-coreg_boldref.json
31+
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-coreg_boldref.nii.gz
32+
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-hmc_boldref.json
33+
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-hmc_boldref.nii.gz
34+
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-preproc_bold.json
35+
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-preproc_bold.nii.gz
36+
sub-01/func/sub-01_task-mixedgamblestask_run-01_from-boldref_to-T1w_mode-image_desc-coreg_xfm.json
37+
sub-01/func/sub-01_task-mixedgamblestask_run-01_from-boldref_to-T1w_mode-image_desc-coreg_xfm.txt
38+
sub-01/func/sub-01_task-mixedgamblestask_run-01_from-orig_to-boldref_mode-image_desc-hmc_xfm.json
39+
sub-01/func/sub-01_task-mixedgamblestask_run-01_from-orig_to-boldref_mode-image_desc-hmc_xfm.txt
40+
sub-01/func/sub-01_task-mixedgamblestask_run-01_hemi-L_space-fsaverage5_bold.func.gii
41+
sub-01/func/sub-01_task-mixedgamblestask_run-01_hemi-L_space-fsaverage5_bold.json
42+
sub-01/func/sub-01_task-mixedgamblestask_run-01_hemi-L_space-fsnative_bold.func.gii
43+
sub-01/func/sub-01_task-mixedgamblestask_run-01_hemi-L_space-fsnative_bold.json
44+
sub-01/func/sub-01_task-mixedgamblestask_run-01_hemi-R_space-fsaverage5_bold.func.gii
45+
sub-01/func/sub-01_task-mixedgamblestask_run-01_hemi-R_space-fsaverage5_bold.json
46+
sub-01/func/sub-01_task-mixedgamblestask_run-01_hemi-R_space-fsnative_bold.func.gii
47+
sub-01/func/sub-01_task-mixedgamblestask_run-01_hemi-R_space-fsnative_bold.json
48+
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-brain_mask.json
49+
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-brain_mask.nii.gz
50+
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-confounds_timeseries.json
51+
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-confounds_timeseries.tsv
52+
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-coreg_boldref.json
53+
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-coreg_boldref.nii.gz
54+
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-hmc_boldref.json
55+
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-hmc_boldref.nii.gz
56+
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-preproc_bold.json
57+
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-preproc_bold.nii.gz
58+
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-boldref_to-T1w_mode-image_desc-coreg_xfm.json
59+
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-boldref_to-T1w_mode-image_desc-coreg_xfm.txt
60+
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-orig_to-boldref_mode-image_desc-hmc_xfm.json
61+
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-orig_to-boldref_mode-image_desc-hmc_xfm.txt
62+
sub-01/func/sub-01_task-mixedgamblestask_run-02_hemi-L_space-fsaverage5_bold.func.gii
63+
sub-01/func/sub-01_task-mixedgamblestask_run-02_hemi-L_space-fsaverage5_bold.json
64+
sub-01/func/sub-01_task-mixedgamblestask_run-02_hemi-L_space-fsnative_bold.func.gii
65+
sub-01/func/sub-01_task-mixedgamblestask_run-02_hemi-L_space-fsnative_bold.json
66+
sub-01/func/sub-01_task-mixedgamblestask_run-02_hemi-R_space-fsaverage5_bold.func.gii
67+
sub-01/func/sub-01_task-mixedgamblestask_run-02_hemi-R_space-fsaverage5_bold.json
68+
sub-01/func/sub-01_task-mixedgamblestask_run-02_hemi-R_space-fsnative_bold.func.gii
69+
sub-01/func/sub-01_task-mixedgamblestask_run-02_hemi-R_space-fsnative_bold.json
70+
sub-01.html

‎.circleci/ds005_legacy_outputs.txt

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)