Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAINT: Revise Numpy, Scipy, Sklearn, Skimage dependencies #158

Merged
merged 1 commit into from
Dec 16, 2020
Merged

MAINT: Revise Numpy, Scipy, Sklearn, Skimage dependencies #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 2 additions & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down