From 2cf1c02f2aa56a39874f6d679c78d55f89cc585c Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Fri, 23 Feb 2018 00:34:59 +0100 Subject: [PATCH 1/2] Lock conda version; rename install --- .travis.yml | 2 +- devtools/ci/{install.sh => miniconda_install.sh} | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) rename devtools/ci/{install.sh => miniconda_install.sh} (83%) diff --git a/.travis.yml b/.travis.yml index 00688f446..c6980d64e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ install: # Do not buffer python outputs; flush them directly to the terminal - export PYTHONUNBUFFERED=true # Sets up a miniconda environment - - source devtools/ci/install.sh + - source devtools/ci/miniconda_install.sh - conda install --yes conda-build - conda build --quiet devtools/conda-recipe - conda create --quiet --yes --name test --use-local openpathsampling-dev diff --git a/devtools/ci/install.sh b/devtools/ci/miniconda_install.sh similarity index 83% rename from devtools/ci/install.sh rename to devtools/ci/miniconda_install.sh index 632ea6f4c..0033f7683 100644 --- a/devtools/ci/install.sh +++ b/devtools/ci/miniconda_install.sh @@ -9,8 +9,10 @@ then fi pyV=${CONDA_PY:0:1} +conda_version="latest" +conda_version="4.4.10" # temporary hack because 'latest' has bad MD5 -MINICONDA=Miniconda${pyV}-latest-Linux-x86_64.sh +MINICONDA=Miniconda${pyV}-${conda_version}-Linux-x86_64.sh MINICONDA_MD5=$(curl -s https://repo.continuum.io/miniconda/ | grep -A3 $MINICONDA | sed -n '4p' | sed -n 's/ *\(.*\)<\/td> */\1/p') wget https://repo.continuum.io/miniconda/$MINICONDA if [[ $MINICONDA_MD5 != $(md5sum $MINICONDA | cut -d ' ' -f 1) ]]; then From 2dcfbd6ad39be19e5c63e77a36c36b0ebdea018c Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Sun, 25 Feb 2018 10:47:43 +0100 Subject: [PATCH 2/2] remove miniconda version pin --- devtools/ci/miniconda_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devtools/ci/miniconda_install.sh b/devtools/ci/miniconda_install.sh index 0033f7683..0767d8f03 100644 --- a/devtools/ci/miniconda_install.sh +++ b/devtools/ci/miniconda_install.sh @@ -10,7 +10,7 @@ fi pyV=${CONDA_PY:0:1} conda_version="latest" -conda_version="4.4.10" # temporary hack because 'latest' has bad MD5 +#conda_version="4.4.10" # can pin a miniconda version like this, if needed MINICONDA=Miniconda${pyV}-${conda_version}-Linux-x86_64.sh MINICONDA_MD5=$(curl -s https://repo.continuum.io/miniconda/ | grep -A3 $MINICONDA | sed -n '4p' | sed -n 's/ *\(.*\)<\/td> */\1/p')