Skip to content

Commit 1f01b96

Browse files
committed
ENH: Bump to py39, add conda config
1 parent 94034ba commit 1f01b96

File tree

2 files changed

+44
-39
lines changed

2 files changed

+44
-39
lines changed

Dockerfile

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MIT License
22
#
3-
# Copyright (c) 2021 The NiPreps Developers
3+
# Copyright (c) 2022 The NiPreps Developers
44
#
55
# Permission is hereby granted, free of charge, to any person obtaining a copy
66
# of this software and associated documentation files (the "Software"), to deal
@@ -50,9 +50,10 @@ ENV LANG="en_US.UTF-8" \
5050
LC_ALL="en_US.UTF-8"
5151

5252
# Leave these args here to better use the Docker build cache
53+
# miniconda index: https://conda.io/en/latest/miniconda_hashes.html
5354
ENV CONDA_PATH="/opt/conda"
54-
ARG CONDA_VERSION=py38_4.10.3
55-
ARG SHA256SUM=935d72deb16e42739d69644977290395561b7a6db059b316958d97939e9bdf3d
55+
ARG CONDA_VERSION=py39_4.12.0
56+
ARG SHA256SUM=78f39f9bae971ec1ae7969f0516017f2413f17796670f7040725dd83fcff5689
5657

5758
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh -O miniconda.sh && \
5859
echo "${SHA256SUM} miniconda.sh" > miniconda.sha256 && \
@@ -72,66 +73,66 @@ ENV PATH="${CONDA_PATH}/bin:$PATH" \
7273
CPATH="${CONDA_PATH}/include:$CPATH" \
7374
PYTHONNOUSERSITE=1
7475

75-
RUN ${CONDA_PATH}/bin/conda install -c conda-forge -c anaconda \
76-
python=3.8 \
77-
attrs=21.2 \
76+
COPY condarc /root/.condarc
77+
78+
RUN ${CONDA_PATH}/bin/conda install \
79+
attrs=21.4 \
7880
codecov=2.1 \
79-
colorclass \
80-
coverage=6.0 \
81-
curl \
82-
datalad=0.15 \
83-
dipy=1.4 \
84-
flake8 \
85-
git \
86-
git-annex=*=alldep* \
87-
graphviz=2.49 \
88-
h5py=3.2 \
81+
colorclass=2.2 \
82+
coverage=6.3 \
83+
curl=7.83 \
84+
datalad=0.16 \
85+
dipy=1.5 \
86+
flake8=4.0 \
87+
git=2.35 \
88+
graphviz=3.0 \
89+
h5py=3.6 \
8990
indexed_gzip=1.6 \
90-
jinja2=2.11 \
91+
jinja2=3.1 \
9192
libxml2=2.9 \
9293
libxslt=1.1 \
9394
lockfile=0.12 \
94-
"matplotlib>=3.3,<4" \
95-
mkl=2021.3 \
95+
matplotlib=3.5 \
96+
mkl=2022.1 \
9697
mkl-service=2.4 \
9798
nibabel=3.2 \
98-
nilearn=0.8 \
99-
nipype=1.6 \
99+
nilearn=0.9 \
100+
nipype=1.8 \
100101
nitime=0.9 \
101-
nodejs=16 \
102+
nodejs=17.9 \
102103
numpy=1.22 \
103-
packaging=21 \
104-
pandas=1.2 \
105-
pandoc=2.14 \
106-
pbr \
107-
pip=21.3 \
108-
pockets \
109-
psutil=5.8 \
104+
packaging=21.3 \
105+
pandas=1.4 \
106+
pandoc=2.18 \
107+
pbr=5.9 \
108+
pip=22.0 \
109+
pockets=0.9 \
110+
psutil=5.9 \
110111
pydot=1.4 \
111112
pydotplus=2.0 \
112-
pytest=6.2 \
113+
pytest=7.1 \
113114
pytest-cov=3.0 \
114115
pytest-env=0.6 \
115-
pytest-xdist \
116-
pyyaml=5.4 \
117-
requests=2.26 \
116+
pytest-xdist=2.5 \
117+
pyyaml=6.0 \
118+
requests=2.27 \
118119
scikit-image=0.19 \
119-
scikit-learn=1.0 \
120+
scikit-learn=1.1 \
120121
scipy=1.8 \
121122
seaborn=0.11 \
122-
setuptools=58.2 \
123-
sphinx=4.2 \
123+
setuptools=62.3 \
124+
sphinx=4.5 \
124125
sphinx_rtd_theme=1.0 \
125-
"svgutils>=0.3.4,<0.4" \
126+
svgutils=0.3 \
126127
toml=0.10 \
127-
traits=6.2 \
128+
traits=6.3 \
128129
zlib=1.2 \
129130
zstd=1.5; sync && \
130131
chmod -R a+rX ${CONDA_PATH}; sync && \
131132
chmod +x ${CONDA_PATH}/bin/*; sync && \
132133
${CONDA_PATH}/bin/conda clean -afy && sync && \
133134
rm -rf ~/.conda ~/.cache/pip/*; sync
134-
135+
135136
# Precaching fonts, set 'Agg' as default backend for matplotlib
136137
RUN ${CONDA_PATH}/bin/python -c "from matplotlib import font_manager" && \
137138
sed -i 's/\(backend *: \).*$/\1Agg/g' $( ${CONDA_PATH}/bin/python -c "import matplotlib; print(matplotlib.matplotlib_fname())" )

condarc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
channel_priority: strict
2+
channels:
3+
- conda-forge
4+
- defaults

0 commit comments

Comments
 (0)