Skip to content

Commit adee4bf

Browse files
oestebanoesteban
committed
update pinning of templateflow, niworkflows and smriprep, update outputs
1 parent b0ea7c4 commit adee4bf

File tree

7 files changed

+40
-7
lines changed

7 files changed

+40
-7
lines changed

‎.circleci/ds005_outputs.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
fmriprep
22
fmriprep/dataset_description.json
3+
fmriprep/desc-aparcaseg_dseg.tsv
4+
fmriprep/desc-aseg_dseg.tsv
35
fmriprep/logs
46
fmriprep/logs/CITATION.bib
57
fmriprep/logs/CITATION.html
@@ -9,7 +11,9 @@ fmriprep/sub-01
911
fmriprep/sub-01/anat
1012
fmriprep/sub-01/anat/sub-01_desc-aparcaseg_dseg.nii.gz
1113
fmriprep/sub-01/anat/sub-01_desc-aseg_dseg.nii.gz
14+
fmriprep/sub-01/anat/sub-01_desc-brain_mask.json
1215
fmriprep/sub-01/anat/sub-01_desc-brain_mask.nii.gz
16+
fmriprep/sub-01/anat/sub-01_desc-preproc_T1w.json
1317
fmriprep/sub-01/anat/sub-01_desc-preproc_T1w.nii.gz
1418
fmriprep/sub-01/anat/sub-01_dseg.nii.gz
1519
fmriprep/sub-01/anat/sub-01_from-MNI152NLin2009cAsym_to-T1w_mode-image_xfm.h5
@@ -27,7 +31,9 @@ fmriprep/sub-01/anat/sub-01_hemi-R_smoothwm.surf.gii
2731
fmriprep/sub-01/anat/sub-01_label-CSF_probseg.nii.gz
2832
fmriprep/sub-01/anat/sub-01_label-GM_probseg.nii.gz
2933
fmriprep/sub-01/anat/sub-01_label-WM_probseg.nii.gz
34+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_desc-brain_mask.json
3035
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
36+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_desc-preproc_T1w.json
3137
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_desc-preproc_T1w.nii.gz
3238
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_dseg.nii.gz
3339
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
@@ -46,12 +52,14 @@ fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-fsnative_hemi-R.f
4652
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_boldref.nii.gz
4753
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_desc-aparcaseg_dseg.nii.gz
4854
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_desc-aseg_dseg.nii.gz
55+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_desc-brain_mask.json
4956
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
5057
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
5158
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_desc-smoothAROMAnonaggr_bold.nii.gz
5259
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_boldref.nii.gz
5360
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_desc-aparcaseg_dseg.nii.gz
5461
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_desc-aseg_dseg.nii.gz
62+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_desc-brain_mask.json
5563
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_desc-brain_mask.nii.gz
5664
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_desc-preproc_bold.nii.gz
5765
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_AROMAnoiseICs.csv
@@ -66,12 +74,14 @@ fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-fsnative_hemi-R.f
6674
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_boldref.nii.gz
6775
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-aparcaseg_dseg.nii.gz
6876
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-aseg_dseg.nii.gz
77+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-brain_mask.json
6978
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
7079
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
7180
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-smoothAROMAnonaggr_bold.nii.gz
7281
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_boldref.nii.gz
7382
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-aparcaseg_dseg.nii.gz
7483
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-aseg_dseg.nii.gz
84+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-brain_mask.json
7585
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-brain_mask.nii.gz
7686
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-preproc_bold.nii.gz
7787
fmriprep/sub-01.html

‎.circleci/ds005_partial_outputs.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
fmriprep
22
fmriprep/dataset_description.json
3+
fmriprep/desc-aparcaseg_dseg.tsv
4+
fmriprep/desc-aseg_dseg.tsv
35
fmriprep/logs
46
fmriprep/logs/CITATION.bib
57
fmriprep/logs/CITATION.html
@@ -9,7 +11,9 @@ fmriprep/sub-01
911
fmriprep/sub-01/anat
1012
fmriprep/sub-01/anat/sub-01_desc-aparcaseg_dseg.nii.gz
1113
fmriprep/sub-01/anat/sub-01_desc-aseg_dseg.nii.gz
14+
fmriprep/sub-01/anat/sub-01_desc-brain_mask.json
1215
fmriprep/sub-01/anat/sub-01_desc-brain_mask.nii.gz
16+
fmriprep/sub-01/anat/sub-01_desc-preproc_T1w.json
1317
fmriprep/sub-01/anat/sub-01_desc-preproc_T1w.nii.gz
1418
fmriprep/sub-01/anat/sub-01_dseg.nii.gz
1519
fmriprep/sub-01/anat/sub-01_from-MNI152NLin2009cAsym_to-T1w_mode-image_xfm.h5
@@ -27,7 +31,9 @@ fmriprep/sub-01/anat/sub-01_hemi-R_smoothwm.surf.gii
2731
fmriprep/sub-01/anat/sub-01_label-CSF_probseg.nii.gz
2832
fmriprep/sub-01/anat/sub-01_label-GM_probseg.nii.gz
2933
fmriprep/sub-01/anat/sub-01_label-WM_probseg.nii.gz
34+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_desc-brain_mask.json
3035
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
36+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_desc-preproc_T1w.json
3137
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_desc-preproc_T1w.nii.gz
3238
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_dseg.nii.gz
3339
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
@@ -46,12 +52,14 @@ fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-fsnative_hemi-R.f
4652
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_boldref.nii.gz
4753
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-aparcaseg_dseg.nii.gz
4854
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-aseg_dseg.nii.gz
55+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-brain_mask.json
4956
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
5057
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
5158
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-smoothAROMAnonaggr_bold.nii.gz
5259
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_boldref.nii.gz
5360
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-aparcaseg_dseg.nii.gz
5461
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-aseg_dseg.nii.gz
62+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-brain_mask.json
5563
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-brain_mask.nii.gz
5664
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-preproc_bold.nii.gz
5765
fmriprep/sub-01.html

‎.circleci/ds054_outputs.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ fmriprep/logs/CITATION.md
77
fmriprep/logs/CITATION.tex
88
fmriprep/sub-100185
99
fmriprep/sub-100185/anat
10+
fmriprep/sub-100185/anat/sub-100185_desc-brain_mask.json
1011
fmriprep/sub-100185/anat/sub-100185_desc-brain_mask.nii.gz
12+
fmriprep/sub-100185/anat/sub-100185_desc-preproc_T1w.json
1113
fmriprep/sub-100185/anat/sub-100185_desc-preproc_T1w.nii.gz
1214
fmriprep/sub-100185/anat/sub-100185_dseg.nii.gz
1315
fmriprep/sub-100185/anat/sub-100185_from-MNI152NLin2009cAsym_to-T1w_mode-image_xfm.h5
@@ -16,7 +18,9 @@ fmriprep/sub-100185/anat/sub-100185_from-T1w_to-MNI152NLin2009cAsym_mode-image_x
1618
fmriprep/sub-100185/anat/sub-100185_label-CSF_probseg.nii.gz
1719
fmriprep/sub-100185/anat/sub-100185_label-GM_probseg.nii.gz
1820
fmriprep/sub-100185/anat/sub-100185_label-WM_probseg.nii.gz
21+
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_desc-brain_mask.json
1922
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
23+
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_desc-preproc_T1w.json
2024
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_desc-preproc_T1w.nii.gz
2125
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_dseg.nii.gz
2226
fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
@@ -25,16 +29,20 @@ fmriprep/sub-100185/anat/sub-100185_space-MNI152NLin2009cAsym_label-WM_probseg.n
2529
fmriprep/sub-100185/func
2630
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_desc-confounds_regressors.tsv
2731
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-MNI152NLin2009cAsym_boldref.nii.gz
32+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-MNI152NLin2009cAsym_desc-brain_mask.json
2833
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
2934
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
3035
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-T1w_boldref.nii.gz
36+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-T1w_desc-brain_mask.json
3137
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-T1w_desc-brain_mask.nii.gz
3238
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-01_space-T1w_desc-preproc_bold.nii.gz
3339
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_desc-confounds_regressors.tsv
3440
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-MNI152NLin2009cAsym_boldref.nii.gz
41+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-MNI152NLin2009cAsym_desc-brain_mask.json
3542
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
3643
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
3744
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-T1w_boldref.nii.gz
45+
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-T1w_desc-brain_mask.json
3846
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-T1w_desc-brain_mask.nii.gz
3947
fmriprep/sub-100185/func/sub-100185_task-machinegame_run-02_space-T1w_desc-preproc_bold.nii.gz
4048
fmriprep/sub-100185.html

‎.circleci/ds210_outputs.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ fmriprep/logs/CITATION.md
77
fmriprep/logs/CITATION.tex
88
fmriprep/sub-02
99
fmriprep/sub-02/anat
10+
fmriprep/sub-02/anat/sub-02_desc-brain_mask.json
1011
fmriprep/sub-02/anat/sub-02_desc-brain_mask.nii.gz
12+
fmriprep/sub-02/anat/sub-02_desc-preproc_T1w.json
1113
fmriprep/sub-02/anat/sub-02_desc-preproc_T1w.nii.gz
1214
fmriprep/sub-02/anat/sub-02_dseg.nii.gz
1315
fmriprep/sub-02/anat/sub-02_from-MNI152NLin2009cAsym_to-T1w_mode-image_xfm.h5
@@ -16,7 +18,9 @@ fmriprep/sub-02/anat/sub-02_from-T1w_to-MNI152NLin2009cAsym_mode-image_xfm.h5
1618
fmriprep/sub-02/anat/sub-02_label-CSF_probseg.nii.gz
1719
fmriprep/sub-02/anat/sub-02_label-GM_probseg.nii.gz
1820
fmriprep/sub-02/anat/sub-02_label-WM_probseg.nii.gz
21+
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_desc-brain_mask.json
1922
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
23+
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_desc-preproc_T1w.json
2024
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_desc-preproc_T1w.nii.gz
2125
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_dseg.nii.gz
2226
fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
@@ -25,6 +29,7 @@ fmriprep/sub-02/anat/sub-02_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
2529
fmriprep/sub-02/func
2630
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_desc-confounds_regressors.tsv
2731
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_space-MNI152NLin2009cAsym_boldref.nii.gz
32+
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_space-MNI152NLin2009cAsym_desc-brain_mask.json
2833
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
2934
fmriprep/sub-02/func/sub-02_task-cuedSGT_run-01_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
3035
fmriprep/sub-02.html

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ RUN python -c "from matplotlib import font_manager" && \
160160
sed -i 's/\(backend *: \).*$/\1Agg/g' $( python -c "import matplotlib; print(matplotlib.matplotlib_fname())" )
161161

162162
# Precaching atlases
163-
RUN pip install --no-cache-dir "templateflow>=0.1.0,<0.2.0a0" && \
163+
RUN pip install --no-cache-dir "templateflow>=0.1.3,<0.2.0a0" && \
164164
python -c "from templateflow import api as tfapi; \
165165
tfapi.get('MNI152Lin'); \
166166
tfapi.get('MNI152NLin2009cAsym'); \

‎fmriprep/__about__.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,23 +89,25 @@
8989
'nilearn',
9090
'nipype>=1.1.6',
9191
'nitime',
92-
'niworkflows<0.9.0a0,>=0.8.0',
92+
'niworkflows',
9393
'numpy',
9494
'pandas',
9595
'psutil>=5.4',
9696
'pybids<0.8.0a0,>=0.7.1',
9797
'pyyaml',
9898
'scikit-image',
99-
'smriprep<0.2.0a0,>=0.1.0',
99+
'smriprep',
100100
'statsmodels',
101101
'tedana>=0.0.5',
102-
'templateflow<0.2.0a0,>=0.1.0',
102+
'templateflow<0.2.0a0,>=0.1.3',
103103
]
104104

105105

106106
LINKS_REQUIRES = [
107107
'git+https://github.com/oesteban/niworkflows.git@'
108-
'7dd12a501dc9eb6c0bbfc699b99742d3481ae9a2#egg=niworkflows-0.8.0'
108+
'627d5810350127e5806c62dda8296cfa1177b202#egg=niworkflows-0.8.0',
109+
'git+https://github.com/oesteban/smriprep.git@'
110+
'3b4f62661c10603f3e48197bc4b27341e72cbad9#egg=smriprep-0.1.0',
109111
]
110112

111113
TESTS_REQUIRES = [

‎requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
git+https://github.com/oesteban/niworkflows.git@7dd12a501dc9eb6c0bbfc699b99742d3481ae9a2#egg=niworkflows-0.8.0
2-
smriprep<0.2.0a0,>=0.1.0
1+
git+https://github.com/oesteban/niworkflows.git@627d5810350127e5806c62dda8296cfa1177b202#egg=niworkflows-0.8.0
2+
git+https://github.com/oesteban/smriprep.git@3b4f62661c10603f3e48197bc4b27341e72cbad9#egg=smriprep-0.1.0

0 commit comments

Comments
 (0)