Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 1fd1856

Browse files
author
Mathieu Velten
authored
demo: check if we are in a virtualenv before overriding PYTHONPATH (#12916)
1 parent 7f92ac4 commit 1fd1856

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Diff for: changelog.d/12916.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Check if we are in a virtual environment before overriding the `PYTHONPATH` environment variable in the demo script.

Diff for: demo/start.sh

+6-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ CWD=$(pwd)
66

77
cd "$DIR/.." || exit
88

9-
PYTHONPATH=$(readlink -f "$(pwd)")
10-
export PYTHONPATH
11-
12-
13-
echo "$PYTHONPATH"
9+
# Do not override PYTHONPATH if we are in a virtual env
10+
if [ "$VIRTUAL_ENV" = "" ]; then
11+
PYTHONPATH=$(readlink -f "$(pwd)")
12+
export PYTHONPATH
13+
echo "$PYTHONPATH"
14+
fi
1415

1516
# Create servers which listen on HTTP at 808x and HTTPS at 848x.
1617
for port in 8080 8081 8082; do

0 commit comments

Comments
 (0)