Skip to content

Commit 8720e13

Browse files
committed
Merge branch 'maint/25.2.x'
2 parents ea1c962 + e8ebbfd commit 8720e13

File tree

4 files changed

+30
-5
lines changed

4 files changed

+30
-5
lines changed

.github/workflows/docker.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
with:
2929
fetch-depth: 200
3030
fetch-tags: true
31+
ref: ${{ github.ref }}
3132
- uses: prefix-dev/setup-pixi@v0.9.1
3233
with:
3334
pixi-version: v0.55.0
@@ -45,6 +46,7 @@ jobs:
4546
with:
4647
fetch-depth: 200
4748
fetch-tags: true
49+
ref: ${{ github.ref }}
4850

4951
- name: Setup Docker buildx
5052
uses: docker/setup-buildx-action@v3

CHANGES.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
25.2.1 (October 03, 2025)
2+
=========================
3+
Bug-fix release in the 25.2.x series.
4+
5+
This fix addresses an issue seen when in datasets with multiple anatomical sessions
6+
that do not perform per-session processing. It also updates the citation boilerplate
7+
when resampling to non-FreeSurfer, non-fsLR surface templates.
8+
9+
* FIX: Pass actual T1w files to summary interface (#3545)
10+
* DOC: Include template metadata information when resampling BOLD to surface (#3544)
11+
12+
113
25.2.0 (October 01, 2025)
214
=========================
315
New feature release in the 25.2.x series.

fmriprep/workflows/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ def init_single_subject_wf(
382382
]) # fmt:skip
383383
else:
384384
workflow.connect([
385-
(src_file, summary, [('source_file', 't1w')]),
385+
(bidssrc, summary, [('t1w', 't1w')]),
386386
(src_file, ds_report_summary, [('source_file', 'source_file')]),
387387
(src_file, ds_report_about, [('source_file', 'source_file')]),
388388
]) # fmt:skip

fmriprep/workflows/bold/resampling.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,8 @@ def init_wb_vol_surf_wf(
576576
workflow = Workflow(name=name)
577577
workflow.__desc__ = """\
578578
The BOLD time-series were resampled onto the native surface of the subject
579-
using the "ribbon-constrained" method
579+
using the "ribbon-constrained" method{' and then dilated by 10 mm' * dilate}.
580580
"""
581-
workflow.__desc__ += ' and then dilated by 10 mm.' if dilate else '.'
582581

583582
inputnode = pe.Node(
584583
niu.IdentityInterface(
@@ -677,7 +676,7 @@ def init_wb_surf_surf_wf(
677676
678677
from fmriprep.workflows.bold.resampling import init_wb_surf_surf_wf
679678
wf = init_wb_surf_surf_wf(
680-
space='fsLR',
679+
template='fsLR',
681680
density='32k',
682681
omp_nthreads=1,
683682
mem_gb=1,
@@ -782,7 +781,7 @@ def init_wb_surf_surf_wf(
782781
resample_to_template = pe.Node(
783782
MetricResample(method='ADAP_BARY_AREA', area_surfs=True),
784783
name='resample_to_template',
785-
mem_gb=1,
784+
mem_gb=mem_gb,
786785
n_procs=omp_nthreads,
787786
)
788787

@@ -806,6 +805,18 @@ def init_wb_surf_surf_wf(
806805
]),
807806
]) # fmt:skip
808807

808+
# Fetch template metadata
809+
template_meta = tf.get_metadata(template.split(':')[0])
810+
template_refs = ['@{}'.format(template.split(':')[0].lower())]
811+
if template_meta.get('RRID', None):
812+
template_refs += [f'RRID:{template_meta["RRID"]}']
813+
814+
workflow.__desc__ = f"""\
815+
The BOLD series was resampled to *{template_meta['Name']}*
816+
[{', '.join(template_refs)}; TemplateFlow ID: {template}] using
817+
the Connectome Workbench.
818+
"""
819+
809820
return workflow
810821

811822

0 commit comments

Comments
 (0)