Skip to content

Commit aac658b

Browse files
committed
MNT: Update Dockerfile and Python environment
1 parent 1860074 commit aac658b

File tree

3 files changed

+53
-54
lines changed

3 files changed

+53
-54
lines changed

Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,14 @@ RUN curl -Ls https://micro.mamba.pm/api/micromamba/linux-64/latest | tar -xvj bi
7474

7575
ENV MAMBA_ROOT_PREFIX="/opt/conda"
7676
COPY env.yml /tmp/env.yml
77+
COPY requirements.txt /tmp/requirements.txt
7778
RUN micromamba create -y -f /tmp/env.yml && \
7879
micromamba clean -y -a
7980

8081
ENV PATH="/opt/conda/envs/smriprep/bin:$PATH"
81-
RUN /opt/conda/envs/smriprep/bin/npm install -g svgo@^2.8 bids-validator@1.11.0 && \
82+
RUN /opt/conda/envs/smriprep/bin/npm install -g svgo@^3.0 bids-validator@^1.13 && \
8283
rm -r ~/.npm
8384

84-
COPY requirements.txt /tmp/requirements.txt
85-
RUN /opt/conda/envs/smriprep/bin/pip install --no-cache-dir -r /tmp/requirements.txt
86-
8785
#
8886
# Main stage
8987
#

env.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,31 @@ channels:
44
- conda-forge
55
# Update this ~yearly; last updated April 2023
66
dependencies:
7-
- python >=3.10,<3.11
7+
- python=3.10
88
# Needed for svgo and bids-validator; consider moving to deno
9-
- nodejs=16
9+
- nodejs=18
1010
# Intel Math Kernel Library for numpy
1111
- mkl=2022.1
1212
- mkl-service=2.4
1313
# Base scientific python stack; required by FSL, so pinned here
14-
- numpy=1.25
14+
- numpy=1.26
1515
- scipy=1.11
16-
- matplotlib=3.7,!=3.7.2
17-
- pandas=2.0
18-
- h5py=3.8
16+
- matplotlib=3.8
17+
- pandas=2.1
18+
- h5py=3.10
1919
# Dependencies compiled against numpy, best to stick with conda
20-
- scikit-image=0.21
20+
- scikit-image=0.22
2121
- scikit-learn=1.3
2222
# Utilities
2323
- graphviz=6.0
2424
- pandoc=3.1
2525
# Workflow dependencies: ANTs
26-
- ants=2.4.4
26+
- ants=2.5.0
2727
# Workflow dependencies: FSL (versions pinned in 6.0.6.2)
28-
- fsl-bet2=2111.0
29-
- fsl-flirt=2111.0
30-
- fsl-fast4=2111.0
28+
- fsl-bet2=2111.4
29+
- fsl-flirt=2111.2
30+
- fsl-fast4=2111.3
3131
- fsl-miscmaths=2203.2
32+
- pip
33+
- pip:
34+
- -r requirements.txt

requirements.txt

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.10
2+
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
5-
# pip-compile --resolver=backtracking
5+
# pip-compile --strip-extras
66
#
77
astor==0.8.1
88
# via formulaic
99
attrs==23.1.0
1010
# via niworkflows
11-
bids-validator==1.12.0
11+
bids-validator==1.13.1
1212
# via pybids
13-
certifi==2023.7.22
13+
certifi==2023.11.17
1414
# via requests
15-
charset-normalizer==3.2.0
15+
charset-normalizer==3.3.2
1616
# via requests
1717
ci-info==0.3.0
1818
# via etelemetry
1919
click==8.1.7
2020
# via
2121
# nipype
2222
# pybids
23-
contourpy==1.1.0
23+
contourpy==1.2.0
2424
# via matplotlib
25-
cycler==0.11.0
25+
cycler==0.12.1
2626
# via matplotlib
2727
docopt==0.6.2
2828
# via num2words
29-
etelemetry==0.3.0
29+
etelemetry==0.3.1
3030
# via nipype
31-
filelock==3.12.2
31+
filelock==3.13.1
3232
# via nipype
33-
fonttools==4.42.1
33+
fonttools==4.44.3
3434
# via matplotlib
3535
formulaic==0.5.2
3636
# via pybids
37-
greenlet==2.0.2
37+
greenlet==3.0.1
3838
# via sqlalchemy
39-
h5py==3.9.0
39+
h5py==3.10.0
4040
# via nitransforms
4141
idna==3.4
4242
# via requests
43-
imageio==2.31.2
43+
imageio==2.32.0
4444
# via scikit-image
45-
indexed-gzip==1.8.3
45+
indexed-gzip==1.8.7
4646
# via smriprep (pyproject.toml)
4747
interface-meta==1.3.0
4848
# via formulaic
@@ -72,12 +72,12 @@ lxml==4.9.3
7272
# svgutils
7373
markupsafe==2.1.3
7474
# via jinja2
75-
matplotlib==3.7.1
75+
matplotlib==3.8.2
7676
# via
7777
# niworkflows
7878
# seaborn
7979
# smriprep (pyproject.toml)
80-
networkx==3.1
80+
networkx==3.2.1
8181
# via
8282
# nipype
8383
# prov
@@ -90,19 +90,19 @@ nibabel==5.1.0
9090
# niworkflows
9191
# pybids
9292
# smriprep (pyproject.toml)
93-
nilearn==0.10.1
93+
nilearn==0.10.2
9494
# via niworkflows
9595
nipype==1.8.6
9696
# via
9797
# niworkflows
9898
# smriprep (pyproject.toml)
9999
nitransforms==23.0.1
100100
# via niworkflows
101-
niworkflows==1.8.1
101+
niworkflows==1.9.0
102102
# via smriprep (pyproject.toml)
103-
num2words==0.5.12
103+
num2words==0.5.13
104104
# via pybids
105-
numpy==1.25.2
105+
numpy==1.26.2
106106
# via
107107
# contourpy
108108
# formulaic
@@ -116,30 +116,30 @@ numpy==1.25.2
116116
# niworkflows
117117
# pandas
118118
# pybids
119-
# pywavelets
120119
# scikit-image
121120
# scikit-learn
122121
# scipy
123122
# seaborn
124123
# smriprep (pyproject.toml)
125124
# tifffile
126-
packaging==23.1
125+
packaging==23.2
127126
# via
127+
# etelemetry
128128
# matplotlib
129129
# nibabel
130130
# nilearn
131131
# nipype
132132
# niworkflows
133133
# scikit-image
134134
# smriprep (pyproject.toml)
135-
pandas==2.0.3
135+
pandas==2.1.3
136136
# via
137137
# formulaic
138138
# nilearn
139139
# niworkflows
140140
# pybids
141141
# seaborn
142-
pillow==10.0.0
142+
pillow==10.0.1
143143
# via
144144
# imageio
145145
# matplotlib
@@ -153,7 +153,7 @@ pybids==0.16.3
153153
# templateflow
154154
pydot==1.4.2
155155
# via nipype
156-
pyparsing==3.0.9
156+
pyparsing==3.1.1
157157
# via
158158
# matplotlib
159159
# pydot
@@ -164,10 +164,8 @@ python-dateutil==2.8.2
164164
# nipype
165165
# pandas
166166
# prov
167-
pytz==2023.3
167+
pytz==2023.3.post1
168168
# via pandas
169-
pywavelets==1.4.1
170-
# via scikit-image
171169
pyyaml==6.0.1
172170
# via
173171
# niworkflows
@@ -181,11 +179,11 @@ requests==2.31.0
181179
# etelemetry
182180
# nilearn
183181
# templateflow
184-
scikit-image==0.21.0
182+
scikit-image==0.22.0
185183
# via niworkflows
186-
scikit-learn==1.3.0
184+
scikit-learn==1.3.2
187185
# via nilearn
188-
scipy==1.11.2
186+
scipy==1.11.4
189187
# via
190188
# formulaic
191189
# nilearn
@@ -195,25 +193,25 @@ scipy==1.11.2
195193
# pybids
196194
# scikit-image
197195
# scikit-learn
198-
seaborn==0.12.2
196+
seaborn==0.13.0
199197
# via niworkflows
200-
simplejson==3.19.1
198+
simplejson==3.19.2
201199
# via nipype
202200
six==1.16.0
203201
# via
204202
# isodate
205203
# python-dateutil
206-
sqlalchemy==2.0.20
204+
sqlalchemy==2.0.23
207205
# via pybids
208206
svgutils==0.3.4
209207
# via niworkflows
210-
templateflow==23.0.0
208+
templateflow==23.1.0
211209
# via
212210
# niworkflows
213211
# smriprep (pyproject.toml)
214212
threadpoolctl==3.2.0
215213
# via scikit-learn
216-
tifffile==2023.8.25
214+
tifffile==2023.9.26
217215
# via scikit-image
218216
tqdm==4.66.1
219217
# via templateflow
@@ -223,13 +221,13 @@ traits==6.3.2
223221
# niworkflows
224222
transforms3d==0.4.1
225223
# via niworkflows
226-
typing-extensions==4.7.1
224+
typing-extensions==4.8.0
227225
# via
228226
# formulaic
229227
# sqlalchemy
230228
tzdata==2023.3
231229
# via pandas
232-
urllib3==2.0.4
230+
urllib3==2.1.0
233231
# via requests
234-
wrapt==1.15.0
232+
wrapt==1.16.0
235233
# via formulaic

0 commit comments

Comments
 (0)