From 598830566487be464c74b83b2f0c39a0b43b6e2c Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Thu, 4 May 2017 10:22:53 +0200
Subject: [PATCH] Update to use bob-devel conda package
---
install/README.md | 6 ------
install/from-scratch.sh | 10 ++--------
install/install-ci.sh | 2 +-
3 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/install/README.md b/install/README.md
index 4999f83..cffe82d 100644
--- a/install/README.md
+++ b/install/README.md
@@ -35,12 +35,6 @@ The parameters are:
2. The name of the environment to be created
3. The version of python to use for this environment
-Once the environment is generated, you may generate the package list like this:
-
-```sh
-$ /opt/conda/bin/conda list -n bob-devel-py27 -e > linux/devel-py27.txt
-```
-
#### Extra OS packages
diff --git a/install/from-scratch.sh b/install/from-scratch.sh
index 8e1fc24..d0de80e 100755
--- a/install/from-scratch.sh
+++ b/install/from-scratch.sh
@@ -5,7 +5,7 @@ set -e
if [ "${#}" != 3 ]; then
echo "usage: `basename $0` <basedir> <name> <python-version>"
- echo "example: `basename $0` /opt/conda bob-devel-py34 3.4"
+ echo "example: `basename $0` /opt/conda bob-devel-py35 3.5"
exit 1
fi
@@ -14,7 +14,6 @@ NAME=$2
PYTHON_VERSION=$3
PYVER=`echo $PYTHON_VERSION | sed -e 's/\.//'`
CONDA=${BASEDIR}/bin/conda
-YML=bob-devel-py${PYVER}.yml
if [ -d ${BASEDIR}/envs/${NAME} ]; then
${CONDA} remove -n ${NAME} --all --yes
@@ -24,12 +23,7 @@ if [ -d ${BASEDIR}/envs/${NAME} ]; then
fi
fi
-if [ ! -e "${YML}" ]; then
- echo "[>>] Downloading latest bob-devel.yml environment..."
- curl -o ${YML} https://gitlab.idiap.ch/bob/bob/raw/master/doc/${YML}
-fi
-
echo "[>>] Creating environment ${NAME} for python ${PYTHON_VERSION} with bob dependencies..."
-${CONDA} env create --name=${NAME} --file=${YML} python=${PYTHON_VERSION}
+${CONDA} create --name=${NAME} --override-channels --channel=http://www.idiap.ch/software/bob/conda --channel=defaults python=${PYTHON_VERSION} bob-devel
echo "[>>] Bye!"
exit 0
diff --git a/install/install-ci.sh b/install/install-ci.sh
index 8a7455f..efc4221 100755
--- a/install/install-ci.sh
+++ b/install/install-ci.sh
@@ -17,7 +17,7 @@ ${CONDA} clean --all --yes
echo "[>>] Updating conda and conda-build..."
${CONDA} install -n root conda conda-build --yes
-for k in 2.7 3.4 3.5; do
+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..."
--
GitLab