Commit 60413763 authored by Willi Rath's avatar Willi Rath
Browse files

Merge branch 'upgrade-miniconda-in-ci' into 'master' 

Upgrade miniconda image used for the tests

See merge request !75
parents 2f3b13ab bfccb46c

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
image: continuumio/miniconda3:4.3.27

image: continuumio/miniconda3:4.5.4



variables:

  DOCKER_DRIVER: overlay

setup_anaconda.sh

+1 −1
Original line number Diff line number Diff line
@@ -35,5 +35,5 @@ source ${target_dir}/bin/activate root || exit 1 
echo "installing env files:"

echo "${@:2}"

for f in "${@:2}"; do

    conda env create -q -f $f || exit 1

    conda env create -f $f || exit 1

done

update_anaconda.sh

+1 −1
Original line number Diff line number Diff line
@@ -25,5 +25,5 @@ echo "${@:2}" 
for f in "${@:2}"; do

    name=`cat $f | grep '^name:' | cut -d: -f2- | tr -d "[:blank:]"`

    grep -q 'pip:' $f && conda env remove -n ${name} -y -q

    conda env update -q -f $f || exit 1

    conda env update -f $f || exit 1

done