From cca21856cea97eb0d618f11174ea20afb0237560 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Fri, 23 Sep 2016 09:59:48 +0200
Subject: [PATCH] Source conda env before pip
---
gitlab/before_test.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gitlab/before_test.sh b/gitlab/before_test.sh
index 4ea6221..39680f8 100755
--- a/gitlab/before_test.sh
+++ b/gitlab/before_test.sh
@@ -12,6 +12,11 @@ PREFIX=`pwd`/${CONDA_PREFIX}
run_cmd $(dirname ${0})/before_build.sh
+# Source the newly created conda environment
+log_info "Running \"source ${CONDA_FOLDER}/bin/activate ${PREFIX}\"..."
+source ${CONDA_FOLDER}/bin/activate ${PREFIX}
+log_info "Environment ${PREFIX} activated"
+
# Verify where pip is installed
use_pip=`which pip`
if [ -z "${use_pip}" ]; then
@@ -26,4 +31,4 @@ if [ "${CI_PROJECT_NAME}" == "bob.buildout" ]; then
run_cmd ${use_pip} install --no-binary ":all:" zc.recipe.egg
fi
-run_cmd ${PREFIX}/bin/pip install --use-wheel --no-index --pre dist/*.whl
+run_cmd ${use_pip} install --use-wheel --no-index --pre dist/*.whl
--
GitLab