Skip to content

Commit 50131fa

Browse files
authored
fix: Adapt to transposed ndcoords in nitransforms (#3517)
nipy/nitransforms#271 transposed image coordinate arrays. In the case of fMRIPrep, this was something we were transposing around, so this fix slightly simplifies things.
2 parents ab58dc9 + 7b7ad0a commit 50131fa

File tree

3 files changed

+23
-18
lines changed

3 files changed

+23
-18
lines changed

fmriprep/interfaces/resampling.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ def resample_image(
569569
hmc = []
570570

571571
# Retrieve the RAS coordinates of the target space
572-
coordinates = nt.base.SpatialReference.factory(target).ndcoords.astype('f4').T
572+
coordinates = nt.base.SpatialReference.factory(target).ndcoords.astype('f4')
573573

574574
# We will operate in voxel space, so get the source affine
575575
vox2ras = source.affine

pyproject.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@ requires-python = ">=3.10"
2222
dependencies = [
2323
"acres >= 0.2.0",
2424
"looseversion >= 1.3",
25-
"nibabel >= 4.0.1",
26-
"nipype >= 1.8.5",
25+
"nibabel >= 5.1.1",
26+
"nipype >= 1.9.0",
2727
"nireports >= 24.1.0",
2828
"nitime >= 0.9",
29-
"nitransforms >= 24.1.1",
29+
"nitransforms >= 25.0.1",
3030
"niworkflows @ git+https://github.com/nipreps/niworkflows.git@master",
31-
"numpy >= 1.24",
31+
"numpy >= 2.0",
3232
"packaging >= 24",
33-
"pandas >= 1.2",
33+
"pandas >= 2.2",
3434
"psutil >= 5.4",
3535
"pybids >= 0.16",
3636
"requests >= 2.27",
3737
"sdcflows >= 2.13.1",
3838
"smriprep @ git+https://github.com/nipreps/smriprep.git@master",
3939
"tedana >= 25.0.0",
4040
"templateflow >= 24.2.2",
41-
"transforms3d >= 0.4",
41+
"transforms3d >= 0.4.2",
4242
"toml >= 0.10",
4343
"codecarbon >= 2",
4444
"APScheduler >= 3.10",

requirements.txt

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file was autogenerated by uv via the following command:
2-
# uv pip compile --extra=container --strip-extras pyproject.toml -c constraints.txt -o requirements.txt -p 3.12
2+
# uv pip compile --extra=container --strip-extras pyproject.toml -o requirements.txt -p 3.12 --python-platform linux
33
acres==0.3.0
44
# via
55
# fmriprep (pyproject.toml)
@@ -68,7 +68,9 @@ contourpy==1.3.2
6868
# bokeh
6969
# matplotlib
7070
cryptography==45.0.4
71-
# via jwcrypto
71+
# via
72+
# jwcrypto
73+
# secretstorage
7274
cycler==0.12.1
7375
# via matplotlib
7476
datalad==1.2.0
@@ -100,6 +102,8 @@ frozendict==2.4.6
100102
# via pybids
101103
fsspec==2025.5.1
102104
# via universal-pathlib
105+
greenlet==3.2.4
106+
# via sqlalchemy
103107
h11==0.16.0
104108
# via httpcore
105109
h5py==3.14.0
@@ -135,6 +139,10 @@ jaraco-context==6.0.1
135139
# keyrings-alt
136140
jaraco-functools==4.1.0
137141
# via keyring
142+
jeepney==0.9.0
143+
# via
144+
# keyring
145+
# secretstorage
138146
jinja2==3.1.6
139147
# via
140148
# bokeh
@@ -234,20 +242,18 @@ nipype==1.10.0
234242
# smriprep
235243
nireports==25.2.0
236244
# via
237-
# -c constraints.txt
238245
# fmriprep (pyproject.toml)
239246
# sdcflows
247+
# smriprep
240248
nitime==0.11
241249
# via fmriprep (pyproject.toml)
242-
nitransforms==24.1.2
250+
nitransforms==25.0.1
243251
# via
244-
# -c constraints.txt
245252
# fmriprep (pyproject.toml)
246253
# niworkflows
247254
# sdcflows
248255
niworkflows==1.13.4
249256
# via
250-
# -c constraints.txt
251257
# fmriprep (pyproject.toml)
252258
# sdcflows
253259
# smriprep
@@ -441,14 +447,14 @@ scipy==1.15.2
441447
# sdcflows
442448
# tedana
443449
sdcflows==2.13.2
444-
# via
445-
# -c constraints.txt
446-
# fmriprep (pyproject.toml)
450+
# via fmriprep (pyproject.toml)
447451
seaborn==0.13.2
448452
# via
449453
# nireports
450454
# niworkflows
451455
# tedana
456+
secretstorage==3.3.3
457+
# via keyring
452458
sentry-sdk==2.28.0
453459
# via fmriprep (pyproject.toml)
454460
shellingham==1.5.4
@@ -474,9 +480,8 @@ svgutils==0.3.4
474480
# via niworkflows
475481
tedana==25.0.1
476482
# via fmriprep (pyproject.toml)
477-
templateflow==24.2.2
483+
templateflow==25.0.3
478484
# via
479-
# -c constraints.txt
480485
# fmriprep (pyproject.toml)
481486
# nireports
482487
# niworkflows

0 commit comments

Comments
 (0)