Skip to content

Commit c616fdd

Browse files
committed
chore: Update conda environment definition
1 parent ba657db commit c616fdd

File tree

2 files changed

+19
-27
lines changed

2 files changed

+19
-27
lines changed

Dockerfile

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,6 @@ COPY docker/files/freesurfer7.3.2-exclude.txt /usr/local/etc/freesurfer7.3.2-exc
5656
RUN curl -sSL https://surfer.nmr.mgh.harvard.edu/pub/dist/freesurfer/7.3.2/freesurfer-linux-ubuntu22_amd64-7.3.2.tar.gz \
5757
| tar zxv --no-same-owner -C /opt --exclude-from=/usr/local/etc/freesurfer7.3.2-exclude.txt
5858

59-
# Connectome Workbench 1.5.0
60-
FROM downloader as workbench
61-
RUN mkdir /opt/workbench && \
62-
curl -sSLO https://www.humanconnectome.org/storage/app/media/workbench/workbench-linux64-v1.5.0.zip && \
63-
unzip workbench-linux64-v1.5.0.zip -d /opt && \
64-
rm workbench-linux64-v1.5.0.zip && \
65-
rm -rf /opt/workbench/libs_linux64_software_opengl /opt/workbench/plugins_linux64 && \
66-
strip --remove-section=.note.ABI-tag /opt/workbench/libs_linux64/libQt5Core.so.5
67-
6859
# Micromamba
6960
FROM downloader as micromamba
7061

@@ -122,7 +113,6 @@ RUN apt-get update && \
122113

123114
# Install files from stages
124115
COPY --from=freesurfer /opt/freesurfer /opt/freesurfer
125-
COPY --from=workbench /opt/workbench /opt/workbench
126116

127117
# Simulate SetUpFreeSurfer.sh
128118
ENV OS="Linux" \
@@ -141,10 +131,6 @@ ENV PERL5LIB="$MINC_LIB_DIR/perl5/5.8.5" \
141131
MNI_PERL5LIB="$MINC_LIB_DIR/perl5/5.8.5" \
142132
PATH="$FREESURFER_HOME/bin:$FREESURFER_HOME/tktools:$MINC_BIN_DIR:$PATH"
143133

144-
# Workbench config
145-
ENV PATH="/opt/workbench/bin_linux64:$PATH" \
146-
LD_LIBRARY_PATH="/opt/workbench/lib_linux64:$LD_LIBRARY_PATH"
147-
148134
# Create a shared $HOME directory
149135
RUN useradd -m -s /bin/bash -G users smriprep
150136
WORKDIR /home/smriprep

env.yml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,36 @@ name: smriprep
22
channels:
33
- https://fsl.fmrib.ox.ac.uk/fsldownloads/fslconda/public/
44
- conda-forge
5-
# Update this ~yearly; last updated March 2024
5+
# Update this ~yearly; last updated Mar 2025
66
dependencies:
7-
- python=3.11
7+
- python=3.12
88
# Needed for svgo and bids-validator; consider moving to deno
99
- nodejs=20
1010
# Intel Math Kernel Library for numpy
11-
- mkl=2023.2
12-
- mkl-service=2.4
11+
- mkl=2024.2.2
12+
- mkl-service=2.4.2
1313
# Base scientific python stack; required by FSL, so pinned here
1414
- numpy=1.26
15-
- scipy=1.13
16-
- matplotlib=3.8
15+
- scipy=1.15
16+
- matplotlib=3.9
1717
- pandas=2.2
18-
- h5py=3.11
18+
- h5py=3.13
1919
# Dependencies compiled against numpy, best to stick with conda
20-
- scikit-image=0.23
21-
- scikit-learn=1.4
20+
- scikit-image=0.25
21+
- scikit-learn=1.6
2222
# Utilities
23-
- graphviz=9.0
24-
- pandoc=3.1
23+
- graphviz=11.0
24+
- pandoc=3.6
2525
# Workflow dependencies: ANTs
2626
- ants=2.5
27-
# Workflow dependencies: FSL (versions pinned in 6.0.7.7)
28-
- fsl-bet2=2111.4
27+
# 5.4.1 and 5.4.2 cause segfaults with ants
28+
# Try to remove this ASAP
29+
# https://github.com/conda-forge/ants-feedstock/issues/19
30+
- libitk=5.4.0
31+
# Workflow dependencies: Connectome Workbench
32+
- connectome-workbench-cli=2.0
33+
# Workflow dependencies: FSL (versions pinned in 6.0.7.13)
34+
- fsl-bet2=2111.8
2935
- fsl-flirt=2111.2
3036
- fsl-fast4=2111.3
3137
- fsl-miscmaths=2203.2

0 commit comments

Comments
 (0)