Browse Source

demo: check if we are in a virtualenv before overriding PYTHONPATH (#12916)

Mathieu Velten 1 year ago
parent
commit
1fd1856afc
2 changed files with 7 additions and 5 deletions
  1. 1 0
      changelog.d/12916.misc
  2. 6 5
      demo/start.sh

+ 1 - 0
changelog.d/12916.misc

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

+ 6 - 5
demo/start.sh

@@ -6,11 +6,12 @@ CWD=$(pwd)
 
 cd "$DIR/.." || exit
 
-PYTHONPATH=$(readlink -f "$(pwd)")
-export PYTHONPATH
-
-
-echo "$PYTHONPATH"
+# Do not override PYTHONPATH if we are in a virtual env
+if [ "$VIRTUAL_ENV" = "" ]; then
+    PYTHONPATH=$(readlink -f "$(pwd)")
+    export PYTHONPATH
+	echo "$PYTHONPATH"
+fi
 
 # Create servers which listen on HTTP at 808x and HTTPS at 848x.
 for port in 8080 8081 8082; do