Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion scripts/activate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ if [[ ! "$PYAV_LIBRARY" ]]; then
fi
export PYAV_LIBRARY

if [[ ! "$PYAV_PYTHON" ]]; then
if [[ "$VIRTUAL_ENV" ]]; then
PYAV_PYTHON="${VIRTUAL_ENV}/bin/python3"
echo "Using activated venv: $VIRTUAL_ENV"
elif [[ ! "$PYAV_PYTHON" ]]; then
PYAV_PYTHON="${PYAV_PYTHON-python3}"
echo 'No $PYAV_PYTHON set; defaulting to python3.'
fi
Expand All @@ -44,6 +47,9 @@ if [[ "$GITHUB_ACTION" ]]; then
# GitHub has a very self-contained environment. Lets just work in that.
echo "We're on CI, so not setting up another virtualenv."

elif [[ "$VIRTUAL_ENV" ]]; then
# Using activated venv
true
else

export PYAV_VENV_NAME="$(uname -s).$(uname -r).$("$PYAV_PYTHON" -c '
Expand Down
Loading