MAINT: Revise Numpy, Scipy, Sklearn, Skimage dependencies

nipreps · Dec 16, 2020 · 834e6b2 · 834e6b2
1 parent 5735be8
commit 834e6b2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -213,15 +213,13 @@ jobs:
               echo "them to your fork with ``git push origin --tags``"
             fi
             # Build docker image
-            e=1 && for i in {1..5}; do
-              docker build --rm \
+            docker build --rm \
                 --cache-from=nipreps/sdcflows \
                 -t nipreps/sdcflows:latest \
                 --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
                 --build-arg VCS_REF=`git rev-parse --short HEAD` \
                 --build-arg VERSION="${CIRCLE_TAG:-$THISVERSION}" . \
-              && e=0 && break || sleep 15
-            done && [ "$e" -eq "0" ]
+                | tee build-output.log
             echo "${CIRCLE_TAG:-$THISVERSION}" >> /tmp/.local-version.txt
       - run:
           name: Docker push to local registry

diff --git a/Dockerfile b/Dockerfile
@@ -86,15 +86,15 @@ RUN conda install -y python=3.7.1 \
                      libxslt=1.1.32 \
                      matplotlib=2.2.2 \
                      mkl-service \
-                     mkl=2018.0.3 \
-                     numpy=1.15.4 \
-                     pandas=0.23.4 \
-                     scikit-learn=0.19.1 \
-                     scipy=1.1.0 \
+                     mkl \
+                     numpy=1.19 \
+                     pip=20.3 \
+                     scikit-learn=0.19 \
+                     scipy=1.5 \
                      setuptools=44.0.0 \
-                     setuptools_scm=3.4.3 \
+                     setuptools_scm=3.4 \
                      toml=0.10 \
-                     traits=4.6.0 \
+                     traits=4.6 \
                      zlib; sync && \
     chmod -R a+rX /usr/local/miniconda; sync && \
     chmod +x /usr/local/miniconda/bin/*; sync && \

diff --git a/setup.cfg b/setup.cfg
@@ -31,8 +31,10 @@ install_requires =
     nibabel >=3.0.1
     nipype >=1.5.1,<2.0
     niworkflows >= 1.4.0rc0
+    numpy <1.20; python_version < "3.7"
     numpy
     pybids >= 0.11.1
+    scikit-image
     templateflow >= 0.6
 test_requires =
     codecov