From 5437ec23bdf90ed639e0d225204d9d011811a231 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Thu, 22 Sep 2016 18:53:34 +0200
Subject: [PATCH] Another hack for bob.buildout
---
gitlab/before_build.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gitlab/before_build.sh b/gitlab/before_build.sh
index f9c14c1..99f07a9 100755
--- a/gitlab/before_build.sh
+++ b/gitlab/before_build.sh
@@ -55,13 +55,14 @@ else
log_info "Using python: ${use_python}"
fi
-PIPOPTS="--find-links ${WHEELS_REPOSITORY} --trusted-host ${WHEELS_SERVER}"
-# zc.recipe.egg cannot be installed via wheels, so we need this hack...
-if [ "${CI_PROJECT_NAME}" != "bob.buildout" ]; then
- PIPOPTS="${PIPOPTS} --pre --use-wheel --no-index"
+# zc.recipe.egg needs some special installation instructions
+if [ "${CI_PROJECT_NAME}" == "bob.buildout" ]; then
+ run_cmd ${use_pip} install --no-binary ":all:" zc.recipe.egg
fi
# Install this package's build dependencies
+PIPOPTS="--find-links ${WHEELS_REPOSITORY} --trusted-host ${WHEELS_SERVER}"
+PIPOPTS="${PIPOPTS} --pre --use-wheel --no-index"
if [ -e requirements.txt ]; then
run_cmd ${use_pip} install ${PIPOPTS} --requirement requirements.txt
else
--
GitLab