Skip to content

GitLab

Commit bdc0a630 authored by Matthew Brett's avatar Matthew Brett
Browse files

Use virtualenv activate for setting path 

Use proper activate sourcing for virtualenv
parent 178cf9e5
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
osx_utils.sh
View file @ bdc0a630
...@@ -260,6 +260,7 @@ function remove_travis_ve_pip { ...@@ -260,6 +260,7 @@ function remove_travis_ve_pip {
} }
function set_py_vars { function set_py_vars {
# Used by terryfy project; left here for back-compatibility
export PATH="`dirname $PYTHON_EXE`:$PATH" export PATH="`dirname $PYTHON_EXE`:$PATH"
export PYTHON_EXE PIP_CMD export PYTHON_EXE PIP_CMD
} }
...@@ -286,8 +287,11 @@ function get_macpython_environment { ...@@ -286,8 +287,11 @@ function get_macpython_environment {
if [ -n "$venv_dir" ]; then if [ -n "$venv_dir" ]; then
install_virtualenv install_virtualenv
make_workon_venv $venv_dir make_workon_venv $venv_dir
source $venv_dir/bin/activate
else
export PATH="`dirname $PYTHON_EXE`:$PATH"
fi fi
set_py_vars export PYTHON_EXE PIP_CMD
} }
function repair_wheelhouse { function repair_wheelhouse {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment