Simplify pip setup

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