From ef6057ab7da33f117302b8456a29dfc129c90e69 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Thu, 26 Jan 2017 09:07:43 +0100
Subject: [PATCH] Simplify pip setup
---
gitlab/before_build.sh | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gitlab/before_build.sh b/gitlab/before_build.sh
index 7ee5ddb..47538e6 100755
--- a/gitlab/before_build.sh
+++ b/gitlab/before_build.sh
@@ -40,14 +40,15 @@ fi
# Install this package's build dependencies
PIPOPTS="--find-links ${WHEELS_REPOSITORY}"
if [ ! -z "${WHEELS_SERVER}" ]; then
- PIPOPTS="${PIPOPTS} --trusted-host ${WHEELS_SERVER}"
+ PIPOPTS="${PIPOPTS} --trusted-host ${WHEELS_SERVER}"
fi
-# when building a tag, do not use beta wheels
+
+# When building a tag, do not use beta wheels
+PIPOPTS="${PIPOPTS} --use-wheel --no-index"
if [ -z "${CI_BUILD_TAG}" ]; then
- PIPOPTS="${PIPOPTS} --pre --use-wheel --no-index"
-else
- PIPOPTS="${PIPOPTS} --use-wheel --no-index"
+ PIPOPTS="${PIPOPTS} --pre"
fi
+
if [ -e requirements.txt ]; then
run_cmd ${use_pip} install ${PIPOPTS} --requirement requirements.txt
else
--
GitLab