Skip to content

Commit bf6326a

Browse files
authored
Merge pull request #2455 from effigies/ci/miniconda_latest
CI: Update Travis builds, Docker to use latest miniconda
2 parents bc6df5b + fba9948 commit bf6326a

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ before_install:
4040
fi;
4141

4242
# handle python operations separately to reduce timeouts
43-
- wget https://repo.continuum.io/miniconda/Miniconda${TRAVIS_PYTHON_VERSION:0:1}-4.3.31-Linux-x86_64.sh
43+
- wget https://repo.continuum.io/miniconda/Miniconda${TRAVIS_PYTHON_VERSION:0:1}-latest-Linux-x86_64.sh
4444
-O /home/travis/.cache/conda.sh
4545
- bash ${HOME}/.cache/conda.sh -b -p ${HOME}/conda
4646
- export PATH=${HOME}/conda/bin:$PATH

docker/generate_dockerfiles.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ done
5454

5555

5656
# neurodocker version 0.3.1-22-gb0ee069
57-
NEURODOCKER_IMAGE="kaczmarj/neurodocker@sha256:c670ec2e0666a63d4e017a73780f66554283e294f3b12250928ee74b8a48bc59"
57+
NEURODOCKER_IMAGE="kaczmarj/neurodocker@sha256:f15ca90803f4b89acfca55cd1c7269bf2ec2dfd95b3de1118b08afa34b87d9d1"
5858

5959
# neurodebian:stretch-non-free pulled on November 3, 2017
6060
BASE_IMAGE="neurodebian@sha256:7590552afd0e7a481a33314724ae27f76ccedd05ffd7ac06ec38638872427b9b"
@@ -88,7 +88,6 @@ function generate_main_dockerfile() {
8888
--user neuro \
8989
--miniconda env_name=neuro \
9090
activate=true \
91-
miniconda_version=4.3.31 \
9291
--copy docker/files/run_builddocs.sh docker/files/run_examples.sh \
9392
docker/files/run_pytests.sh nipype/external/fsl_imglob.py /usr/bin/ \
9493
--copy . /src/nipype \

0 commit comments

Comments
 (0)