From 5aa0cce134c4d44e187e5916b721eb65ce4c37e2 Mon Sep 17 00:00:00 2001 From: Atsushi Togo Date: Tue, 22 Nov 2016 15:47:03 +0900 Subject: [PATCH] Update for using trusty container in travis. --- .travis.yml | 2 ++ conda/anaconda_deploy.sh | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c685d05f..40decf97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,8 @@ before_install: install: - conda install --yes python=$TRAVIS_PYTHON_VERSION pip numpy h5py pyyaml matplotlib lapack + - conda config --add channels conda-forge + - conda install --yes python=$TRAVIS_PYTHON_VERSION lapack - pwd - ./get_nanoversion.sh - cat __nanoversion__.txt diff --git a/conda/anaconda_deploy.sh b/conda/anaconda_deploy.sh index abe6888f..565f72ca 100755 --- a/conda/anaconda_deploy.sh +++ b/conda/anaconda_deploy.sh @@ -6,7 +6,6 @@ export GIT_BRANCH=$3 conda install conda-build anaconda-client --yes conda config --add channels atztogo -conda config --add channels conda-forge conda build conda --no-anaconda-upload TRG=`conda build conda --output |sed -e 's/--/-*-/'` echo "Uploading: $TRG"