Skip to content

Commit b567cf6

Browse files
authored
Merge branch 'master' into enh/estimated-trt
2 parents 0f3c1de + f3b32fc commit b567cf6

File tree

21 files changed

+630
-177
lines changed

21 files changed

+630
-177
lines changed

.github/workflows/build-test-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
git config --global user.name 'NiPreps Bot'
123123
git config --global user.email '[email protected]'
124124
- name: Install the latest version of uv
125-
uses: astral-sh/setup-uv@v5
125+
uses: astral-sh/setup-uv@v6
126126
- name: Set up Python ${{ matrix.python-version }}
127127
uses: conda-incubator/setup-miniconda@v3
128128
with:
@@ -147,7 +147,7 @@ jobs:
147147
- name: Install fsl and ANTs
148148
run: |
149149
# libitk 5.4.1+ segfaults with ants 2.5.4
150-
conda install fsl-fugue fsl-topup ants 'libitk!=5.4.1,!=5.4.2'
150+
conda install fsl-fugue fsl-topup ants 'libitk=5.4.0'
151151
- uses: actions/cache@v4
152152
with:
153153
path: ~/.cache/templateflow

.maint/update_requirements.py

Lines changed: 0 additions & 44 deletions
This file was deleted.

CHANGES.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
2.12.0 (March 21, 2025)
2+
=======================
3+
Feature release in the 2.12.x series.
4+
5+
This release migrates from the deprecated ``niworkflows.reporting``
6+
module to the ``nireports`` package.
7+
8+
* FIX: AttributeError for _ApplyCoeffsFieldInputSpec (#481)
9+
* ENH: Allow running SyN SDC without using prior (#480)
10+
* ENH: Allow estimated and fallback TotalReadoutTime (#477)
11+
* RF: Transition from niworkflows reporting interfaces (#473)
12+
* DOC: Fix broken link [skip ci] (#482)
13+
* MNT: Add `defaults` to `conda` channels in `build-test-publish` GHA (#474)
14+
* MNT: Update `niworkflows` version to 1.11.0 (#478)
15+
16+
117
2.11.0 (December 18, 2024)
218
==========================
319
Feature release in the 2.11.x series.

docs/methods.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Direct B0 mapping sequences
7676
Some MR schemes such as :abbr:`SEI (spiral-echo imaging)` can directly
7777
reconstruct an estimate of *the fieldmap in Hz*, :math:`V(i,j,k)`.
7878
These *fieldmaps* are described with more detail `here
79-
<https://cni.stanford.edu/wiki/GE_Processing#Fieldmaps>`__.
79+
<https://cni.su.domains/wiki/index.php?title=GE_Processing#Fieldmaps>`__.
8080

8181
.. _sdc_phasediff :
8282

env.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,28 @@ name: sdcflows
22
channels:
33
- https://fsl.fmrib.ox.ac.uk/fsldownloads/fslconda/public/
44
- conda-forge
5-
# Update this ~yearly; last updated April 2023
5+
# Update this ~yearly; last updated Mar 2025
66
dependencies:
7-
- python=3.10
7+
- python=3.12
88
# Intel Math Kernel Library for numpy
9-
- mkl=2022.1
10-
- mkl-service=2.4
9+
- mkl=2024.2.2
10+
- mkl-service=2.4.2
1111
# Base scientific python stack; required by FSL, so pinned here
1212
- numpy=1.26
13-
- scipy=1.11
14-
- matplotlib=3.8
15-
- pandas=2.1
16-
- h5py=3.8
13+
- scipy=1.15
14+
- matplotlib=3.9
15+
- pandas=2.2
16+
- h5py=3.13
1717
# Dependencies compiled against numpy, best to stick with conda
18-
- scikit-image=0.22
18+
- scikit-image=0.25
1919
# Utilities
20-
- graphviz=6.0
20+
- graphviz=11.0
2121
# Workflow dependencies: ANTs
22-
- ants=2.4.4
23-
# Workflow dependencies: FSL (versions pinned in 6.0.6.2)
24-
- fsl-fugue=2201.2
25-
- fsl-topup=2203.1
22+
- ants=2.5
23+
# 5.4.1 and 5.4.2 cause segfaults with ants
24+
# Try to remove this ASAP
25+
# https://github.com/conda-forge/ants-feedstock/issues/19
26+
- libitk=5.4.0
27+
# Workflow dependencies: FSL (versions pinned in 6.0.7.13)
28+
- fsl-fugue=2201.5
29+
- fsl-topup=2203.5

min-requirements.txt

Lines changed: 0 additions & 15 deletions
This file was deleted.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ dependencies = [
2727
"nibabel >= 3.0",
2828
"nipype >= 1.8.5",
2929
"migas >= 0.4.0",
30-
"nireports >= 24.1.0",
30+
"nireports >= 25.0.1",
3131
"niworkflows >= 1.11.0",
3232
"nitransforms >= 24.1.0",
33-
"numpy >= 1.22",
33+
"numpy >= 1.23",
3434
"pybids >= 0.16.4",
3535
"scikit-image >= 0.18",
3636
"scipy >= 1.8.1",

0 commit comments

Comments
 (0)