Skip to content

Commit 5bb1cf5

Browse files
committed
Merge tag '25.1.4'
25.1.4 (July 31, 2025) Patch release in the 25.1.x series. This includes additional fixes for non-unicode ``B0FieldIdentifier`` keys. * FIX: Allow warning kwargs (#3483) * FIX: Remove non-alphanumeric characters from fmapid in fmapreg transform (#3490)
2 parents 2e22bdc + a61f3f0 commit 5bb1cf5

File tree

5 files changed

+36
-9
lines changed

5 files changed

+36
-9
lines changed

CHANGES.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
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+
111
25.1.3 (June 19, 2025)
212
======================
313
Patch release in the 25.1.x series.

constraints.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# 25.1.x
2+
nireports ~= 25.0.1
3+
nitransforms ~= 24.1.2
4+
niworkflows ~= 1.13.5
5+
sdcflows ~= 2.13.2
6+
smriprep ~= 0.18.0
7+
templateflow ~= 24.2.2

fmriprep/utils/bids.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import json
2828
import os
29+
import re
2930
import sys
3031
from collections import defaultdict
3132
from functools import cache
@@ -85,8 +86,8 @@ def collect_derivatives(
8586
# whereas relevant src file will be "bold".
8687
query = {**entities, **q}
8788
if xfm == 'boldref2fmap' and fieldmap_id:
88-
# fieldmaps have ids like auto_00000
89-
query['to'] = fieldmap_id.replace('_', '')
89+
# fieldmaps have non-alphanumeric characters removed from their IDs in filenames
90+
query['to'] = re.sub(r'[^a-zA-Z0-9]', '', fieldmap_id)
9091
item = layout.get(return_type='filename', **query)
9192
if not item:
9293
continue

fmriprep/workflows/bold/fit.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
# https://www.nipreps.org/community/licensing/
2222
#
2323
import os
24+
import re
2425
import typing as ty
2526

2627
import bids
@@ -514,7 +515,7 @@ def init_bold_fit_wf(
514515
bids_root=layout.root,
515516
output_dir=config.execution.fmriprep_dir,
516517
source='boldref',
517-
dest=fieldmap_id.replace('_', ''),
518+
dest=re.sub(r'[^a-zA-Z0-9]', '', fieldmap_id),
518519
name='ds_fmapreg_wf',
519520
)
520521
ds_fmapreg_wf.inputs.inputnode.source_files = [bold_file]

requirements.txt

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file was autogenerated by uv via the following command:
2-
# uv pip compile --extra=container --strip-extras pyproject.toml -o requirements.txt -p 3.12
3-
acres==0.5.0
2+
# uv pip compile --extra=container --strip-extras pyproject.toml -c constraints.txt -o requirements.txt -p 3.12
3+
acres==0.3.0
44
# via
55
# fmriprep (pyproject.toml)
66
# bidsschematools
@@ -234,17 +234,20 @@ nipype==1.10.0
234234
# smriprep
235235
nireports==25.2.0
236236
# via
237+
# -c constraints.txt
237238
# fmriprep (pyproject.toml)
238239
# sdcflows
239240
nitime==0.11
240241
# via fmriprep (pyproject.toml)
241242
nitransforms==24.1.2
242243
# via
244+
# -c constraints.txt
243245
# fmriprep (pyproject.toml)
244246
# niworkflows
245247
# sdcflows
246248
niworkflows==1.13.4
247249
# via
250+
# -c constraints.txt
248251
# fmriprep (pyproject.toml)
249252
# sdcflows
250253
# smriprep
@@ -437,14 +440,16 @@ scipy==1.15.2
437440
# scikit-learn
438441
# sdcflows
439442
# tedana
440-
sdcflows==2.13.1
441-
# via fmriprep (pyproject.toml)
443+
sdcflows==2.13.2
444+
# via
445+
# -c constraints.txt
446+
# fmriprep (pyproject.toml)
442447
seaborn==0.13.2
443448
# via
444449
# nireports
445450
# niworkflows
446451
# tedana
447-
sentry-sdk==2.30.0
452+
sentry-sdk==2.28.0
448453
# via fmriprep (pyproject.toml)
449454
shellingham==1.5.4
450455
# via typer
@@ -456,7 +461,9 @@ six==1.17.0
456461
# pybtex
457462
# python-dateutil
458463
smriprep==0.18.0
459-
# via fmriprep (pyproject.toml)
464+
# via
465+
# -c constraints.txt
466+
# fmriprep (pyproject.toml)
460467
sniffio==1.3.1
461468
# via
462469
# anyio
@@ -469,6 +476,7 @@ tedana==25.0.1
469476
# via fmriprep (pyproject.toml)
470477
templateflow==24.2.2
471478
# via
479+
# -c constraints.txt
472480
# fmriprep (pyproject.toml)
473481
# nireports
474482
# niworkflows

0 commit comments

Comments
 (0)