Skip to content

Commit b4cced1

Browse files
authored
MNT: Update environment pins (#3226)
## Changes proposed in this pull request Updates pins for: 1) Python (3.11) 2) NodeJS (20) 3) Scipy numeric stack (conda) 4) ANTs (conda) 5) FSL (conda) 6) Python dependencies (pip) ## Documentation that should be reviewed Third party dependencies.
1 parent 6830894 commit b4cced1

File tree

4 files changed

+75
-65
lines changed

4 files changed

+75
-65
lines changed

Dockerfile

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323
# SOFTWARE.
2424

2525
# Ubuntu 22.04 LTS - Jammy
26-
ARG BASE_IMAGE=ubuntu:jammy-20230308
26+
ARG BASE_IMAGE=ubuntu:jammy-20240125
2727

2828
#
29-
# fMRIPrep wheel
29+
# Build wheel
3030
#
3131
FROM python:slim AS src
3232
RUN pip install build
3333
RUN apt-get update && \
3434
apt-get install -y --no-install-recommends git
35-
COPY . /src/fmriprep
36-
RUN python -m build /src/fmriprep
35+
COPY . /src
36+
RUN python -m build /src
3737

3838
#
3939
# Download stages
@@ -96,9 +96,16 @@ RUN mkdir /opt/convert3d && \
9696

9797
# Micromamba
9898
FROM downloader as micromamba
99+
100+
# Install a C compiler to build extensions when needed.
101+
# traits<6.4 wheels are not available for Python 3.11+, but build easily.
102+
RUN apt-get update && \
103+
apt-get install -y --no-install-recommends build-essential && \
104+
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
105+
99106
WORKDIR /
100107
# Bump the date to current to force update micromamba
101-
RUN echo "2023.04.05"
108+
RUN echo "2024.02.06"
102109
RUN curl -Ls https://micro.mamba.pm/api/micromamba/linux-64/latest | tar -xvj bin/micromamba
103110

104111
ENV MAMBA_ROOT_PREFIX="/opt/conda"
@@ -112,7 +119,7 @@ RUN micromamba create -y -f /tmp/env.yml && \
112119
# Check if this is still necessary when updating the base image.
113120
ENV PATH="/opt/conda/envs/fmriprep/bin:$PATH" \
114121
UV_USE_IO_URING=0
115-
RUN npm install -g svgo@^3.0.4 bids-validator@^1.13.1 && \
122+
RUN npm install -g svgo@^3.2.0 bids-validator@^1.14.0 && \
116123
rm -r ~/.npm
117124

118125
#
@@ -249,7 +256,7 @@ RUN curl -L -H "Accept: application/octet-stream" https://api.github.com/repos/e
249256
&& chmod +x /usr/local/bin/msm
250257

251258
# Installing FMRIPREP
252-
COPY --from=src /src/fmriprep/dist/*.whl .
259+
COPY --from=src /src/dist/*.whl .
253260
RUN pip install --no-cache-dir $( ls *.whl )[container,test]
254261

255262
RUN find $HOME -type d -exec chmod go=u {} + && \

docs/installation.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ nipype_.
8585
not handled by the Python's packaging system (Pypi) used to deploy
8686
the ``fmriprep`` package:
8787

88-
- FSL_ (version 6.0.6.2)
89-
- ANTs_ (version 2.4.4)
90-
- AFNI_ (version 23.1.05)
91-
- `C3D <https://sourceforge.net/projects/c3d/>`_ (version 1.3.0)
88+
- FSL_ (version 6.0.7.7)
89+
- ANTs_ (version 2.5.1)
90+
- AFNI_ (version 24.0.05)
91+
- `C3D <https://sourceforge.net/projects/c3d/>`_ (version 1.4.0)
9292
- FreeSurfer_ (version 7.3.2)
93-
- `bids-validator <https://github.com/bids-standard/bids-validator>`_ (version 1.8.0)
93+
- `bids-validator <https://github.com/bids-standard/bids-validator>`_ (version 1.14.0)
9494
- `connectome-workbench <https://www.humanconnectome.org/software/connectome-workbench>`_ (version 1.5.0)
9595

9696
Not running on a local machine? - Data transfer

env.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,36 @@ name: fmriprep
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 Jan 2024
66
dependencies:
7-
- python=3.10
7+
- python=3.11
88
# Needed for svgo and bids-validator; consider moving to deno
9-
- nodejs=18
9+
- nodejs=20
1010
# Intel Math Kernel Library for numpy
11-
- mkl=2022.1
12-
- mkl-service=2.4
11+
- mkl=2023.2.0
12+
- mkl-service=2.4.0
1313
# git-annex for templateflow users with DataLad superdatasets
1414
- git-annex=*=alldep*
1515
# Base scientific python stack; required by FSL, so pinned here
1616
- numpy=1.26
1717
- scipy=1.11
1818
- matplotlib=3.8
19-
- pandas=2.1
19+
- pandas=2.2
2020
- h5py=3.10
2121
# Dependencies compiled against numpy, best to stick with conda
2222
- nitime=0.10
2323
- scikit-image=0.22
24-
- scikit-learn=1.3
24+
- scikit-learn=1.4
2525
# Utilities
26-
- graphviz=6.0
26+
- graphviz=9.0
2727
- pandoc=3.1
2828
# Workflow dependencies: ANTs
29-
- ants=2.5.0
30-
# Workflow dependencies: FSL (versions pinned in 6.0.7.4)
29+
- ants=2.5
30+
# Workflow dependencies: FSL (versions pinned in 6.0.7.7)
3131
- fsl-bet2=2111.4
3232
- fsl-flirt=2111.2
3333
- fsl-fast4=2111.3
34-
- fsl-fugue=2201.3
34+
- fsl-fugue=2201.4
3535
- fsl-mcflirt=2111.0
3636
- fsl-miscmaths=2203.2
3737
- fsl-topup=2203.2

0 commit comments

Comments
 (0)