Skip to content

Commit 217a350

Browse files
bpinsardbpinsard
committed
Merge remote-tracking branch 'upstream/master' into enh/fs_long
2 parents 0ebd309 + de72651 commit 217a350

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+845
-329
lines changed

‎.circleci/ds005_fasttrack_outputs.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,12 @@ sub-01/anat/sub-01_hemi-R_desc-reg_sphere.surf.gii
2323
sub-01/anat/sub-01_hemi-R_space-fsLR_desc-msmsulc_sphere.surf.gii
2424
sub-01/anat/sub-01_hemi-R_space-fsLR_desc-reg_sphere.surf.gii
2525
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
2826
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-confounds_timeseries.json
2927
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-confounds_timeseries.tsv
3028
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-coreg_boldref.json
3129
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-coreg_boldref.nii.gz
3230
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-hmc_boldref.json
3331
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
3632
sub-01/func/sub-01_task-mixedgamblestask_run-01_from-boldref_to-T1w_mode-image_desc-coreg_xfm.json
3733
sub-01/func/sub-01_task-mixedgamblestask_run-01_from-boldref_to-T1w_mode-image_desc-coreg_xfm.txt
3834
sub-01/func/sub-01_task-mixedgamblestask_run-01_from-orig_to-boldref_mode-image_desc-hmc_xfm.json
@@ -45,16 +41,12 @@ sub-01/func/sub-01_task-mixedgamblestask_run-01_hemi-R_space-fsaverage5_bold.fun
4541
sub-01/func/sub-01_task-mixedgamblestask_run-01_hemi-R_space-fsaverage5_bold.json
4642
sub-01/func/sub-01_task-mixedgamblestask_run-01_hemi-R_space-fsnative_bold.func.gii
4743
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
5044
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-confounds_timeseries.json
5145
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-confounds_timeseries.tsv
5246
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-coreg_boldref.json
5347
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-coreg_boldref.nii.gz
5448
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-hmc_boldref.json
5549
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
5850
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-boldref_to-T1w_mode-image_desc-coreg_xfm.json
5951
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-boldref_to-T1w_mode-image_desc-coreg_xfm.txt
6052
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-orig_to-boldref_mode-image_desc-hmc_xfm.json

‎.circleci/ds005_outputs.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,12 @@ sub-01/anat/sub-01_label-CSF_probseg.nii.gz
4343
sub-01/anat/sub-01_label-GM_probseg.nii.gz
4444
sub-01/anat/sub-01_label-WM_probseg.nii.gz
4545
sub-01/func
46-
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-brain_mask.json
47-
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-brain_mask.nii.gz
4846
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-confounds_timeseries.json
4947
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-confounds_timeseries.tsv
5048
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-coreg_boldref.json
5149
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-coreg_boldref.nii.gz
5250
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-hmc_boldref.json
5351
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-hmc_boldref.nii.gz
54-
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-preproc_bold.json
55-
sub-01/func/sub-01_task-mixedgamblestask_run-01_desc-preproc_bold.nii.gz
5652
sub-01/func/sub-01_task-mixedgamblestask_run-01_from-boldref_to-T1w_mode-image_desc-coreg_xfm.json
5753
sub-01/func/sub-01_task-mixedgamblestask_run-01_from-boldref_to-T1w_mode-image_desc-coreg_xfm.txt
5854
sub-01/func/sub-01_task-mixedgamblestask_run-01_from-orig_to-boldref_mode-image_desc-hmc_xfm.json
@@ -65,16 +61,12 @@ sub-01/func/sub-01_task-mixedgamblestask_run-01_hemi-R_space-fsaverage5_bold.fun
6561
sub-01/func/sub-01_task-mixedgamblestask_run-01_hemi-R_space-fsaverage5_bold.json
6662
sub-01/func/sub-01_task-mixedgamblestask_run-01_hemi-R_space-fsnative_bold.func.gii
6763
sub-01/func/sub-01_task-mixedgamblestask_run-01_hemi-R_space-fsnative_bold.json
68-
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-brain_mask.json
69-
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-brain_mask.nii.gz
7064
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-confounds_timeseries.json
7165
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-confounds_timeseries.tsv
7266
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-coreg_boldref.json
7367
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-coreg_boldref.nii.gz
7468
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-hmc_boldref.json
7569
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-hmc_boldref.nii.gz
76-
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-preproc_bold.json
77-
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-preproc_bold.nii.gz
7870
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-boldref_to-T1w_mode-image_desc-coreg_xfm.json
7971
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-boldref_to-T1w_mode-image_desc-coreg_xfm.txt
8072
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-orig_to-boldref_mode-image_desc-hmc_xfm.json

‎.circleci/ds005_partial_fasttrack_outputs.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,12 @@ sub-01/fmap/sub-01_run-02_fmapid-auto00000_desc-magnitude_fieldmap.nii.gz
5151
sub-01/fmap/sub-01_run-02_fmapid-auto00000_desc-preproc_fieldmap.json
5252
sub-01/fmap/sub-01_run-02_fmapid-auto00000_desc-preproc_fieldmap.nii.gz
5353
sub-01/func
54-
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-brain_mask.json
55-
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-brain_mask.nii.gz
5654
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-confounds_timeseries.json
5755
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-confounds_timeseries.tsv
5856
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-coreg_boldref.json
5957
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-coreg_boldref.nii.gz
6058
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-hmc_boldref.json
6159
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-hmc_boldref.nii.gz
62-
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-preproc_bold.json
63-
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-preproc_bold.nii.gz
6460
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-boldref_to-T1w_mode-image_desc-coreg_xfm.json
6561
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-boldref_to-T1w_mode-image_desc-coreg_xfm.txt
6662
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-boldref_to-auto00000_mode-image_xfm.json

‎.circleci/ds005_partial_outputs.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,12 @@ sub-01/fmap/sub-01_run-02_fmapid-auto00000_desc-magnitude_fieldmap.nii.gz
7373
sub-01/fmap/sub-01_run-02_fmapid-auto00000_desc-preproc_fieldmap.json
7474
sub-01/fmap/sub-01_run-02_fmapid-auto00000_desc-preproc_fieldmap.nii.gz
7575
sub-01/func
76-
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-brain_mask.json
77-
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-brain_mask.nii.gz
7876
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-confounds_timeseries.json
7977
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-confounds_timeseries.tsv
8078
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-coreg_boldref.json
8179
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-coreg_boldref.nii.gz
8280
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-hmc_boldref.json
8381
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-hmc_boldref.nii.gz
84-
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-preproc_bold.json
85-
sub-01/func/sub-01_task-mixedgamblestask_run-02_desc-preproc_bold.nii.gz
8682
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-boldref_to-auto00000_mode-image_xfm.json
8783
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-boldref_to-auto00000_mode-image_xfm.txt
8884
sub-01/func/sub-01_task-mixedgamblestask_run-02_from-boldref_to-T1w_mode-image_desc-coreg_xfm.json

‎.circleci/ds210_fasttrack_outputs.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ sub-02/func/sub-02_task-cuedSGT_run-01_desc-coreg_boldref.json
3131
sub-02/func/sub-02_task-cuedSGT_run-01_desc-coreg_boldref.nii.gz
3232
sub-02/func/sub-02_task-cuedSGT_run-01_desc-hmc_boldref.json
3333
sub-02/func/sub-02_task-cuedSGT_run-01_desc-hmc_boldref.nii.gz
34-
sub-02/func/sub-02_task-cuedSGT_run-01_desc-preproc_bold.json
35-
sub-02/func/sub-02_task-cuedSGT_run-01_desc-preproc_bold.nii.gz
3634
sub-02/func/sub-02_task-cuedSGT_run-01_echo-1_desc-preproc_bold.json
3735
sub-02/func/sub-02_task-cuedSGT_run-01_echo-1_desc-preproc_bold.nii.gz
3836
sub-02/func/sub-02_task-cuedSGT_run-01_echo-2_desc-preproc_bold.json
@@ -45,8 +43,6 @@ sub-02/func/sub-02_task-cuedSGT_run-01_from-boldref_to-T1w_mode-image_desc-coreg
4543
sub-02/func/sub-02_task-cuedSGT_run-01_from-boldref_to-T1w_mode-image_desc-coreg_xfm.txt
4644
sub-02/func/sub-02_task-cuedSGT_run-01_from-orig_to-boldref_mode-image_desc-hmc_xfm.json
4745
sub-02/func/sub-02_task-cuedSGT_run-01_from-orig_to-boldref_mode-image_desc-hmc_xfm.txt
48-
sub-02/func/sub-02_task-cuedSGT_run-01_space-boldref_T2starmap.json
49-
sub-02/func/sub-02_task-cuedSGT_run-01_space-boldref_T2starmap.nii.gz
5046
sub-02/func/sub-02_task-cuedSGT_run-01_space-MNI152NLin2009cAsym_boldref.nii.gz
5147
sub-02/func/sub-02_task-cuedSGT_run-01_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
5248
sub-02/func/sub-02_task-cuedSGT_run-01_space-MNI152NLin2009cAsym_desc-preproc_bold.json

‎.circleci/ds210_outputs.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ sub-02/func/sub-02_task-cuedSGT_run-01_desc-coreg_boldref.json
4141
sub-02/func/sub-02_task-cuedSGT_run-01_desc-coreg_boldref.nii.gz
4242
sub-02/func/sub-02_task-cuedSGT_run-01_desc-hmc_boldref.json
4343
sub-02/func/sub-02_task-cuedSGT_run-01_desc-hmc_boldref.nii.gz
44-
sub-02/func/sub-02_task-cuedSGT_run-01_desc-preproc_bold.json
45-
sub-02/func/sub-02_task-cuedSGT_run-01_desc-preproc_bold.nii.gz
4644
sub-02/func/sub-02_task-cuedSGT_run-01_echo-1_desc-preproc_bold.json
4745
sub-02/func/sub-02_task-cuedSGT_run-01_echo-1_desc-preproc_bold.nii.gz
4846
sub-02/func/sub-02_task-cuedSGT_run-01_echo-2_desc-preproc_bold.json
@@ -55,8 +53,6 @@ sub-02/func/sub-02_task-cuedSGT_run-01_from-boldref_to-T1w_mode-image_desc-coreg
5553
sub-02/func/sub-02_task-cuedSGT_run-01_from-boldref_to-T1w_mode-image_desc-coreg_xfm.txt
5654
sub-02/func/sub-02_task-cuedSGT_run-01_from-orig_to-boldref_mode-image_desc-hmc_xfm.json
5755
sub-02/func/sub-02_task-cuedSGT_run-01_from-orig_to-boldref_mode-image_desc-hmc_xfm.txt
58-
sub-02/func/sub-02_task-cuedSGT_run-01_space-boldref_T2starmap.json
59-
sub-02/func/sub-02_task-cuedSGT_run-01_space-boldref_T2starmap.nii.gz
6056
sub-02/func/sub-02_task-cuedSGT_run-01_space-MNI152NLin2009cAsym_boldref.nii.gz
6157
sub-02/func/sub-02_task-cuedSGT_run-01_space-MNI152NLin2009cAsym_desc-brain_mask.nii.gz
6258
sub-02/func/sub-02_task-cuedSGT_run-01_space-MNI152NLin2009cAsym_desc-preproc_bold.json

‎.github/workflows/contrib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
steps:
3333
- uses: actions/checkout@v4
3434
- name: Set up Python ${{ matrix.python-version }}
35-
uses: actions/setup-python@v4
35+
uses: actions/setup-python@v5
3636
with:
3737
python-version: ${{ matrix.python-version }}
3838
- name: Display Python version

‎.github/workflows/pre-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
matrix:
2929
os: ['ubuntu-latest']
30-
python-version: ['3.10', '3.11']
30+
python-version: ['3.10', '3.11', '3.12']
3131
install: ['pip']
3232
check: ['tests']
3333
pip-flags: ['PRE_PIP_FLAGS']
@@ -45,7 +45,7 @@ jobs:
4545
- name: Install dependencies
4646
run: .maint/ci/install_dependencies.sh
4747
- name: Set up Python ${{ matrix.python-version }}
48-
uses: actions/setup-python@v4
48+
uses: actions/setup-python@v5
4949
with:
5050
python-version: ${{ matrix.python-version }}
5151
- name: Display Python version

‎.github/workflows/stable.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
matrix:
3232
os: ['ubuntu-latest']
33-
python-version: ['3.10', '3.11']
33+
python-version: ['3.10', '3.11', '3.12']
3434
install: ['pip']
3535
check: ['tests']
3636
pip-flags: ['']
@@ -48,7 +48,7 @@ jobs:
4848
- name: Install dependencies
4949
run: .maint/ci/install_dependencies.sh
5050
- name: Set up Python ${{ matrix.python-version }}
51-
uses: actions/setup-python@v4
51+
uses: actions/setup-python@v5
5252
with:
5353
python-version: ${{ matrix.python-version }}
5454
- name: Display Python version

‎.maint/CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Before every release, unlisted contributors will be invited again to add their n
3232
| Liem | Franz | | 0000-0003-0646-4810 | URPP Dynamics of Healthy Aging, University of Zurich |
3333
| Lurie | Daniel J. | | 0000-0001-8012-6399 | Department of Psychology, University of California, Berkeley |
3434
| Ma | Feilong | | 0000-0002-6838-3971 | Dartmouth College: Hanover, NH, United States |
35+
| Madison | Thomas | | 0000-0003-3030-6580 | Department of Pediatrics, University of Minnesota, MN, USA |
3536
| Mentch | Jeff | | 0000-0002-7762-8678 | Speech & Hearing Bioscience & Technology Program, Harvard University |
3637
| Moodie | Craig A. | | 0000-0003-0867-1469 | Department of Psychology, Stanford University |
3738
| Naveau | Mikaël | | 0000-0001-6948-9068 | Cyceron, UMS 3408 (CNRS - UCBN), France |

0 commit comments

Comments
 (0)