Skip to content

Commit 834e6b2

Browse files
committed
MAINT: Revise Numpy, Scipy, Sklearn, Skimage dependencies
1 parent 5735be8 commit 834e6b2

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.circleci/config.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,13 @@ jobs:
213213
echo "them to your fork with ``git push origin --tags``"
214214
fi
215215
# Build docker image
216-
e=1 && for i in {1..5}; do
217-
docker build --rm \
216+
docker build --rm \
218217
--cache-from=nipreps/sdcflows \
219218
-t nipreps/sdcflows:latest \
220219
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
221220
--build-arg VCS_REF=`git rev-parse --short HEAD` \
222221
--build-arg VERSION="${CIRCLE_TAG:-$THISVERSION}" . \
223-
&& e=0 && break || sleep 15
224-
done && [ "$e" -eq "0" ]
222+
| tee build-output.log
225223
echo "${CIRCLE_TAG:-$THISVERSION}" >> /tmp/.local-version.txt
226224
- run:
227225
name: Docker push to local registry

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ RUN conda install -y python=3.7.1 \
8686
libxslt=1.1.32 \
8787
matplotlib=2.2.2 \
8888
mkl-service \
89-
mkl=2018.0.3 \
90-
numpy=1.15.4 \
91-
pandas=0.23.4 \
92-
scikit-learn=0.19.1 \
93-
scipy=1.1.0 \
89+
mkl \
90+
numpy=1.19 \
91+
pip=20.3 \
92+
scikit-learn=0.19 \
93+
scipy=1.5 \
9494
setuptools=44.0.0 \
95-
setuptools_scm=3.4.3 \
95+
setuptools_scm=3.4 \
9696
toml=0.10 \
97-
traits=4.6.0 \
97+
traits=4.6 \
9898
zlib; sync && \
9999
chmod -R a+rX /usr/local/miniconda; sync && \
100100
chmod +x /usr/local/miniconda/bin/*; sync && \

setup.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ install_requires =
3131
nibabel >=3.0.1
3232
nipype >=1.5.1,<2.0
3333
niworkflows >= 1.4.0rc0
34+
numpy <1.20; python_version < "3.7"
3435
numpy
3536
pybids >= 0.11.1
37+
scikit-image
3638
templateflow >= 0.6
3739
test_requires =
3840
codecov

0 commit comments

Comments
 (0)