Skip to content

Commit 86e241f

Browse files
authored
MNT: Update environment (#3073)
We've got a couple dependabot nudges. Running `pip-compile`, but with the following manual edits: 1) No change to nipreps dependencies. This also means skipping `importlib_resources`. 2) Avoiding scipy 1.11 for now, as networkx has pinned `!= 1.11.0, != 1.11.1`. Assuming this passes, I'm going to see about relaxing the tedana pin.
2 parents a2a96bb + 33dbb4a commit 86e241f

File tree

4 files changed

+170
-58
lines changed

4 files changed

+170
-58
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ ENV MKL_NUM_THREADS=1 \
244244

245245
# Installing FMRIPREP
246246
COPY --from=src /src/fmriprep/dist/*.whl .
247-
RUN pip install --no-cache-dir $( ls *.whl )[telemetry,test]
247+
RUN pip install --no-cache-dir $( ls *.whl )[container,test]
248248

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

env.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,18 @@ dependencies:
1010
# Intel Math Kernel Library for numpy
1111
- mkl=2022.1
1212
- mkl-service=2.4
13+
# git-annex for templateflow users with DataLad superdatasets
14+
- git-annex=*=alldep*
1315
# Base scientific python stack; required by FSL, so pinned here
14-
- numpy=1.24
15-
- scipy=1.10
16-
- matplotlib=3.7
16+
- numpy=1.25
17+
- scipy=1.11
18+
- matplotlib=3.7,!=3.7.2
1719
- pandas=2.0
1820
- h5py=3.8
1921
# Dependencies compiled against numpy, best to stick with conda
20-
- nitime=0.9
21-
- scikit-image=0.20
22-
- scikit-learn=1.2
22+
- nitime=0.10
23+
- scikit-image=0.21
24+
- scikit-learn=1.3
2325
# Utilities
2426
- graphviz=6.0
2527
- pandoc=3.1

pyproject.toml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ dependencies = [
3232
"psutil >= 5.4",
3333
"pybids >= 0.15.2",
3434
"requests",
35-
"sdcflows @ git+https://github.com/nipreps/sdcflows.git@master",
35+
"sdcflows @ git+https://github.com/nipreps/sdcflows.git@maint/2.5.x",
3636
"smriprep @ git+https://github.com/nipreps/smriprep.git@master",
37-
"tedana ~= 0.0.9",
37+
"tedana >= 0.0.9",
3838
"templateflow >= 23.0.0",
3939
"toml",
4040
"codecarbon",
@@ -64,6 +64,12 @@ dev = [
6464
]
6565
duecredit = ["duecredit"]
6666
resmon = []
67+
container = [
68+
"fmriprep[telemetry]",
69+
# templateflow extras
70+
"datalad",
71+
"datalad-osf",
72+
]
6773
telemetry = [
6874
"migas >= 0.3.0",
6975
"sentry-sdk >= 1.3",

0 commit comments

Comments
 (0)