Don't change venv (doesn't work on macosx)

gitlab/before_test.sh

@@ -20,7 +20,7 @@ fi
 
 # zc.recipe.egg needs some special installation instructions
 if [ "${CI_PROJECT_NAME}" == "bob.buildout" ]; then
-  run_cmd ${use_pip} install --upgrade --no-binary ":all:" zc.recipe.egg
+  run_cmd_ld ${use_pip} install --upgrade --no-binary ":all:" zc.recipe.egg
 fi
 
-run_cmd ${use_pip} install --upgrade --use-wheel --no-index --pre dist/*.whl
+run_cmd_ld ${use_pip} install --upgrade --use-wheel --no-index --pre dist/*.whl

gitlab/build.sh

@@ -5,23 +5,18 @@ source $(dirname ${0})/functions.sh
 
 run_cmd_ld ./bin/buildout
 
-# Corrects the virtualenv to take LD_LIBRARY_PATH into account
-if [ ${ARCH} == "linux" ]; then
-  fix_venv
-fi
-
 if [ -x ./bin/bob_dbmanage.py ]; then
-  run_cmd ./bin/bob_dbmanage.py all download --force;
+  run_cmd_ld ./bin/bob_dbmanage.py all download --force;
 fi
 
 if [ -d ./doc ]; then
-  run_cmd ./bin/sphinx-build doc sphinx
+  run_cmd_ld ./bin/sphinx-build doc sphinx
 fi
 
 if [ -z "${WHEEL_TAG}" ]; then
   # C/C++ extensions
-  run_cmd ./bin/python setup.py bdist_wheel
+  run_cmd_ld ./bin/python setup.py bdist_wheel
 else
   # Python-only packages
-  run_cmd ./bin/python setup.py bdist_wheel --python-tag ${WHEEL_TAG}
+  run_cmd_ld ./bin/python setup.py bdist_wheel --python-tag ${WHEEL_TAG}
 fi

gitlab/functions.sh

@@ -73,7 +73,7 @@ run_cmd_ld() {
 
 # Runs setup.py
 setup() {
-  run_cmd ${PREFIX}/bin/python setup.py ${@}
+  run_cmd_ld ${PREFIX}/bin/python setup.py ${@}
 }
 
 

gitlab/test.sh

@@ -6,8 +6,8 @@ source $(dirname ${0})/functions.sh
 run_cmd cd ${PREFIX}
 
 # The tests:
-run_cmd ${PREFIX}/bin/python ${BOB_PREFIX_PATH}/bin/coverage run --source=${CI_PROJECT_NAME} ${BOB_PREFIX_PATH}/bin/nosetests -sv ${CI_PROJECT_NAME}
-run_cmd ${PREFIX}/bin/python ${BOB_PREFIX_PATH}/bin/coverage report
-run_cmd ${PREFIX}/bin/python ${BOB_PREFIX_PATH}/bin/sphinx-build -b doctest ${CI_PROJECT_DIR}/doc ${CI_PROJECT_NAME}/sphinx
+run_cmd_ld ${PREFIX}/bin/python ${BOB_PREFIX_PATH}/bin/coverage run --source=${CI_PROJECT_NAME} ${BOB_PREFIX_PATH}/bin/nosetests -sv ${CI_PROJECT_NAME}
+run_cmd_ld ${PREFIX}/bin/python ${BOB_PREFIX_PATH}/bin/coverage report
+run_cmd_ld ${PREFIX}/bin/python ${BOB_PREFIX_PATH}/bin/sphinx-build -b doctest ${CI_PROJECT_DIR}/doc ${CI_PROJECT_NAME}/sphinx
 
 run_cmd cd ${CI_PROJECT_DIR}