diff --git a/install/from-scratch.sh b/install/from-scratch.sh index 181f9ff7db6746c05d772c9fdc22a98a1e296dff..2331df090b4abe69dc67bad1bf3e2df3b814a98e 100755 --- a/install/from-scratch.sh +++ b/install/from-scratch.sh @@ -4,14 +4,15 @@ set -e if [ "${#}" != 3 ]; then - echo "usage: `basename $0` <basedir> <name> <python-version>" - echo "example: `basename $0` /opt/conda bob-devel-py35 3.5" + echo "usage: `basename $0` <basedir> <name> <python-version> <bob-devel>" + echo "example: `basename $0` /opt/conda bob-devel-py35 3.5 2017.06.06" exit 1 fi BASEDIR=$1 NAME=$2 PYTHON_VERSION=$3 +BOB_DEVEL_VERSION=$4 PYVER=`echo $PYTHON_VERSION | sed -e 's/\.//'` CONDA=${BASEDIR}/bin/conda @@ -24,6 +25,6 @@ if [ -d ${BASEDIR}/envs/${NAME} ]; then fi echo "[>>] Creating environment ${NAME} for python ${PYTHON_VERSION} with bob dependencies..." -${CONDA} create --yes --name=${NAME} --override-channels --channel=http://www.idiap.ch/software/bob/conda --channel=defaults python=${PYTHON_VERSION} bob-devel +${CONDA} create --yes --name=${NAME} --override-channels --channel=http://www.idiap.ch/software/bob/conda --channel=defaults python=${PYTHON_VERSION} bob-devel=${BOB_DEVEL} echo "[>>] Bye!" exit 0 diff --git a/install/install-ci.sh b/install/install-ci.sh index efc42210fc4dccde2675271670bbe6ec0b25d9a2..2c169be78c4b5dd2b0c75ec0a767d22c7eb92cda 100755 --- a/install/install-ci.sh +++ b/install/install-ci.sh @@ -2,14 +2,15 @@ # Sat 28 Jan 09:16:48 2017 CET if [ "${#}" != 1 ]; then - echo "usage: `basename $0` <prefix>" - echo "example: `basename $0` /opt/conda" + echo "usage: `basename $0` <prefix> <bob-devel-version>" + echo "example: `basename $0` /opt/conda 2017.06.06" exit 1 fi BASEDIR=$1 BINDIR=$(dirname $0) CONDA=${BASEDIR}/bin/conda +BOB_DEVEL_VERSION=$2 echo "[>>] Cleaning conda cache..." ${CONDA} clean --all --yes @@ -21,5 +22,5 @@ for k in 2.7 3.5 3.6; do py=`echo $k | sed -e 's/\.//'` e="bob-devel-py$py" echo "[>>] Installing CI environment $e using python-$k..." - ${BINDIR}/from-scratch.sh ${BASEDIR} $e $k + ${BINDIR}/from-scratch.sh ${BASEDIR} $e $k ${BOB_DEVEL_VERSION} done