Skip to content

Commit fcd3231

Browse files
committed
Merge remote-tracking branch 'upstream/master' into wb
2 parents 9be14e0 + c961b3c commit fcd3231

Some content is hidden

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

44 files changed

+795
-328
lines changed

.circleci/config.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,6 @@ jobs:
486486
487487
# Inject pretend metadata
488488
json_sidecar=/tmp/data/${DATASET}/task-mixedgamblestask_bold.json
489-
awk 'NR==1{print; print " \"TotalReadoutTime\": 0.05,"} NR!=1' ${json_sidecar} > tmp && mv tmp ${json_sidecar}
490489
awk 'NR==1{print; print " \"PhaseEncodingDirection\": \"j\","} NR!=1' ${json_sidecar} > tmp && mv tmp ${json_sidecar}
491490
492491
fmriprep-docker -i nipreps/fmriprep:latest \
@@ -530,7 +529,8 @@ jobs:
530529
/tmp/data/${DATASET} /tmp/${DATASET}/fmriprep-partial participant \
531530
--fs-subjects-dir /tmp/${DATASET}/freesurfer \
532531
${FASTRACK_ARG} \
533-
--sloppy --write-graph --use-syn-sdc --mem-mb 14336 \
532+
--use-syn-sdc --fallback-total-readout-time 0.03125 \
533+
--sloppy --write-graph --mem-mb 14336 \
534534
--output-spaces MNI152NLin2009cAsym fsaverage5 fsnative MNI152NLin6Asym anat \
535535
--nthreads 4 --cifti-output --project-goodvoxels -vv
536536
- store_artifacts:
@@ -745,7 +745,7 @@ jobs:
745745
# Inject pretend metadata for SDCFlows not to crash
746746
# TODO / open question - do all echos need the metadata?
747747
chmod +w /tmp/data/${DATASET}
748-
echo '{"PhaseEncodingDirection": "j", "TotalReadoutTime": 0.058}' >> /tmp/data/${DATASET}/task-cuedSGT_bold.json
748+
echo '{"PhaseEncodingDirection": "j"}' >> /tmp/data/${DATASET}/task-cuedSGT_bold.json
749749
chmod -R -w /tmp/data/${DATASET}
750750
751751
fmriprep-docker -i nipreps/fmriprep:latest \
@@ -754,7 +754,8 @@ jobs:
754754
/tmp/data/${DATASET} /tmp/${DATASET}/fmriprep participant \
755755
${FASTRACK_ARG} \
756756
--me-output-echos \
757-
--fs-no-reconall --use-syn-sdc --ignore slicetiming \
757+
--fs-no-reconall --ignore slicetiming \
758+
--use-syn-sdc --fallback-total-readout-time 0.0625 \
758759
--dummy-scans 1 --sloppy --write-graph \
759760
--output-spaces MNI152NLin2009cAsym \
760761
--mem-mb 14336 --nthreads 4 -vv

.circleci/ds005_fasttrack_outputs.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@ sub-01
1212
sub-01/anat
1313
sub-01/anat/sub-01_desc-ribbon_mask.json
1414
sub-01/anat/sub-01_desc-ribbon_mask.nii.gz
15+
sub-01/anat/sub-01_hemi-L_desc-cortex_mask.json
16+
sub-01/anat/sub-01_hemi-L_desc-cortex_mask.label.gii
1517
sub-01/anat/sub-01_hemi-L_desc-preproc_sphere.surf.gii
1618
sub-01/anat/sub-01_hemi-L_desc-preproc_white.surf.gii
1719
sub-01/anat/sub-01_hemi-L_space-fsLR_desc-msmsulc_sphere.surf.gii
1820
sub-01/anat/sub-01_hemi-L_space-fsLR_desc-reg_sphere.surf.gii
1921
sub-01/anat/sub-01_hemi-L_space-fsaverage_desc-reg_sphere.surf.gii
22+
sub-01/anat/sub-01_hemi-R_desc-cortex_mask.json
23+
sub-01/anat/sub-01_hemi-R_desc-cortex_mask.label.gii
2024
sub-01/anat/sub-01_hemi-R_desc-preproc_sphere.surf.gii
2125
sub-01/anat/sub-01_hemi-R_desc-preproc_white.surf.gii
2226
sub-01/anat/sub-01_hemi-R_space-fsLR_desc-msmsulc_sphere.surf.gii

.circleci/ds005_outputs.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ sub-01/anat/sub-01_from-fsnative_to-T1w_mode-image_xfm.txt
2121
sub-01/anat/sub-01_from-MNI152NLin2009cAsym_to-T1w_mode-image_xfm.h5
2222
sub-01/anat/sub-01_from-T1w_to-fsnative_mode-image_xfm.txt
2323
sub-01/anat/sub-01_from-T1w_to-MNI152NLin2009cAsym_mode-image_xfm.h5
24+
sub-01/anat/sub-01_hemi-L_desc-cortex_mask.json
25+
sub-01/anat/sub-01_hemi-L_desc-cortex_mask.label.gii
2426
sub-01/anat/sub-01_hemi-L_midthickness.surf.gii
2527
sub-01/anat/sub-01_hemi-L_pial.surf.gii
2628
sub-01/anat/sub-01_hemi-L_space-fsLR_desc-msmsulc_sphere.surf.gii
@@ -30,6 +32,8 @@ sub-01/anat/sub-01_hemi-L_sphere.surf.gii
3032
sub-01/anat/sub-01_hemi-L_sulc.shape.gii
3133
sub-01/anat/sub-01_hemi-L_thickness.shape.gii
3234
sub-01/anat/sub-01_hemi-L_white.surf.gii
35+
sub-01/anat/sub-01_hemi-R_desc-cortex_mask.json
36+
sub-01/anat/sub-01_hemi-R_desc-cortex_mask.label.gii
3337
sub-01/anat/sub-01_hemi-R_midthickness.surf.gii
3438
sub-01/anat/sub-01_hemi-R_pial.surf.gii
3539
sub-01/anat/sub-01_hemi-R_space-fsLR_desc-msmsulc_sphere.surf.gii

.circleci/ds005_partial_fasttrack_outputs.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ sub-01
1212
sub-01/anat
1313
sub-01/anat/sub-01_desc-ribbon_mask.json
1414
sub-01/anat/sub-01_desc-ribbon_mask.nii.gz
15+
sub-01/anat/sub-01_hemi-L_desc-cortex_mask.json
16+
sub-01/anat/sub-01_hemi-L_desc-cortex_mask.label.gii
1517
sub-01/anat/sub-01_hemi-L_desc-preproc_sphere.surf.gii
1618
sub-01/anat/sub-01_hemi-L_desc-preproc_white.surf.gii
1719
sub-01/anat/sub-01_hemi-L_space-fsLR_den-32k_desc-preproc_midthickness.surf.gii
@@ -20,6 +22,8 @@ sub-01/anat/sub-01_hemi-L_space-fsLR_den-32k_desc-preproc_white.surf.gii
2022
sub-01/anat/sub-01_hemi-L_space-fsLR_desc-msmsulc_sphere.surf.gii
2123
sub-01/anat/sub-01_hemi-L_space-fsLR_desc-reg_sphere.surf.gii
2224
sub-01/anat/sub-01_hemi-L_space-fsaverage_desc-reg_sphere.surf.gii
25+
sub-01/anat/sub-01_hemi-R_desc-cortex_mask.json
26+
sub-01/anat/sub-01_hemi-R_desc-cortex_mask.label.gii
2327
sub-01/anat/sub-01_hemi-R_desc-preproc_sphere.surf.gii
2428
sub-01/anat/sub-01_hemi-R_desc-preproc_white.surf.gii
2529
sub-01/anat/sub-01_hemi-R_space-fsLR_den-32k_desc-preproc_midthickness.surf.gii

.circleci/ds005_partial_outputs.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ sub-01/anat/sub-01_from-MNI152NLin6Asym_to-T1w_mode-image_xfm.h5
2323
sub-01/anat/sub-01_from-T1w_to-fsnative_mode-image_xfm.txt
2424
sub-01/anat/sub-01_from-T1w_to-MNI152NLin2009cAsym_mode-image_xfm.h5
2525
sub-01/anat/sub-01_from-T1w_to-MNI152NLin6Asym_mode-image_xfm.h5
26+
sub-01/anat/sub-01_hemi-L_desc-cortex_mask.json
27+
sub-01/anat/sub-01_hemi-L_desc-cortex_mask.label.gii
2628
sub-01/anat/sub-01_hemi-L_midthickness.surf.gii
2729
sub-01/anat/sub-01_hemi-L_pial.surf.gii
2830
sub-01/anat/sub-01_hemi-L_space-fsLR_den-32k_midthickness.surf.gii
@@ -35,6 +37,8 @@ sub-01/anat/sub-01_hemi-L_sphere.surf.gii
3537
sub-01/anat/sub-01_hemi-L_sulc.shape.gii
3638
sub-01/anat/sub-01_hemi-L_thickness.shape.gii
3739
sub-01/anat/sub-01_hemi-L_white.surf.gii
40+
sub-01/anat/sub-01_hemi-L_desc-cortex_mask.json
41+
sub-01/anat/sub-01_hemi-L_desc-cortex_mask.label.gii
3842
sub-01/anat/sub-01_hemi-R_midthickness.surf.gii
3943
sub-01/anat/sub-01_hemi-R_pial.surf.gii
4044
sub-01/anat/sub-01_hemi-R_space-fsLR_den-32k_midthickness.surf.gii

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
sudo apt update
5959
sudo apt install -y --no-install-recommends graphviz
6060
- name: Install the latest version of uv
61-
uses: astral-sh/setup-uv@v5
61+
uses: astral-sh/setup-uv@v6
6262
- name: Set up Python ${{ matrix.python-version }}
6363
uses: actions/setup-python@v5
6464
with:
@@ -89,7 +89,7 @@ jobs:
8989
with:
9090
persist-credentials: false
9191
- name: Install the latest version of uv
92-
uses: astral-sh/setup-uv@v5
92+
uses: astral-sh/setup-uv@v6
9393
- name: Install tox
9494
run: uv tool install tox --with=tox-uv
9595
- name: Show tox config

.maint/CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Before every release, unlisted contributors will be invited again to add their n
1313
| Bellec | Pierre | | 0000-0002-9111-0699 | SIMEXP Lab, CRIUGM, University of Montréal, Montréal, Canada |
1414
| Benson | Noah C. | | 0000-0002-2365-8265 | Department of Psychology, New York University |
1515
| Bhagwat | Nikhil | | 0000-0001-6073-7141 | Montreal Neurological Institute, McGill University |
16+
| Camacho | Milton | | 0000-0002-5379-5076 | Department of Pediadrics, University of Calgary |
1617
| Callenberg | Keith | | 0000-0001-7786-9300 | Department of Psychiatry, University of Pittsburgh |
1718
| Cieslak | Matthew | | 0000-0002-1931-4734 | Perelman School of Medicine, University of Pennsylvania, PA, USA |
1819
| de la Vega | Alejandro | | 0000-0001-9062-3778 | University of Texas at Austin |

.pre-commit-config.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ repos:
1212
- id: check-toml
1313
- id: check-added-large-files
1414
- repo: https://github.com/astral-sh/ruff-pre-commit
15-
rev: v0.9.1
15+
rev: v0.12.2
1616
hooks:
17-
- id: ruff
17+
- id: ruff-check
1818
args: [ --fix ]
1919
- id: ruff-format
20-
- id: ruff
21-
args: [ --select, ISC001, --fix ]

CHANGES.rst

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,91 @@
1+
25.1.4 (July 31, 2025)
2+
======================
3+
Patch release in the 25.1.x series.
4+
5+
This includes additional fixes for non-unicode ``B0FieldIdentifier`` keys.
6+
7+
* FIX: Allow warning kwargs (#3483)
8+
* FIX: Remove non-alphanumeric characters from fmapid in fmapreg transform (#3490)
9+
10+
11+
25.1.3 (June 19, 2025)
12+
======================
13+
Patch release in the 25.1.x series.
14+
15+
This resolves a bug introduced in a dependency between 25.1.1 and 25.1.2.
16+
17+
25.1.2 (June 17, 2025)
18+
======================
19+
Patch release in the 25.1.x series.
20+
21+
This fixes crashes encountered processing a BIDS dataset with one or more
22+
``B0FieldIdentifier`` keys with non-unicode word characters.
23+
24+
* FIX: Use sanitized fieldmap naming (#3471)
25+
26+
25.1.1 (May 23, 2025)
27+
=====================
28+
Patch release in the 25.1.x series.
29+
30+
This includes small fixes for working with precomputed fieldmaps,
31+
including adding fieldmap correction sections to the reports,
32+
which were previously omitted if the fieldmap was not calculated
33+
during the fMRIPrep run.
34+
35+
* FIX: Improve retrieval of precomputed pepolar fieldmaps (#3466)
36+
* RF: Separate fieldmap registration from coreg ref generation (#3467)
37+
38+
39+
25.1.0 (May 21, 2025)
40+
=====================
41+
New feature release in the 25.1.x series.
42+
43+
This release includes a small fix related to interpolations on the bounds
44+
of the image field-of-view. This improves consistency with prior versions
45+
of fMRIPrep for data with limited fields-of-view or small bounding boxes.
46+
47+
This release also adds support for providing fallback values for
48+
``TotalReadoutTime`` metadata.
49+
For Philips datasets, if ``EstimatedTotalReadoutTime`` or
50+
``EstimatedEffectiveEchoSpacing`` are available, you can use these
51+
by passing ``--fallback-total-readout-time estimated``.
52+
For datasets with no readout time information, a numeric value can be passed,
53+
for example, ``--fallback-total-readout-time 0.05``.
54+
If the readout time information is known, it is preferable to encode directly
55+
in the dataset, but there are cases where it is better to explicitly pass the
56+
value to the software than inject uncertain metadata into the dataset.
57+
In particular, the true readout time is not necessary for SyN-SDC, but a value
58+
is nonetheless needed in order to estimate the inhomogeneity field.
59+
60+
This release is a long-term-support *candidate*. We will be performing
61+
extensive tests and monitoring bug reports over the next couple of months
62+
to determine whether issues can be addressed without making breaking changes.
63+
64+
Structural processing changes
65+
-----------------------------
66+
67+
This release pins a version of sMRIPrep (0.18) that correctly handles precomputed
68+
tissue probability maps.
69+
The FAST segmentation also now skips an internal bias field correction step
70+
that is redundant with ANTs N4 correction,
71+
and may be inappropriate for non-human populations.
72+
73+
Fieldmap processing changes
74+
---------------------------
75+
76+
This release pins a version of SDCFlows (2.13) that includes several improvements to
77+
the SyN-SDC method.
78+
In particular, the fieldmap prior that constrained the scope of displacements
79+
was reintroduced and refined.
80+
81+
All merged pull requests
82+
------------------------
83+
84+
* FIX: Use nearest mode for extrapolating data outside image boundaries (#3453)
85+
* ENH: Replace c3d_affine_tool with a ConvertAffine interface (#3464)
86+
* ENH: Add flag to fallback to Estimated* metadata or a passed value for TotalReadoutTime (#3423)
87+
88+
189
25.0.0 (March 25, 2025)
290
=======================
391
New feature release in the 25.0.x series.

REFERENCES.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
| nibabel | https://doi.org/10.5281/zenodo.60808 | https://github.com/nipy/nibabel/ |
3434
| nilearn | https://doi.org/10.3389/fninf.2014.00014 | https://github.com/nilearn/nilearn/ |
3535
| nipype | https://doi.org/10.3389/fninf.2011.00013 https://doi.org/10.5281/zenodo.581704 | https://github.com/nipy/nipype/ |
36-
| convert3d | | https://sourceforge.net/projects/c3d/ |
3736
| **Graphics**
3837
| seaborn | https://doi.org/10.5281/zenodo.883859 | https://github.com/mwaskom/seaborn |
3938
| matplotlib 2.0.0 | https://doi.org/10.5281/zenodo.248351 | https://github.com/matplotlib/matplotlib |

0 commit comments

Comments
 (0)