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

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

Merged
MatMaul merged 3 commits into from
May 30, 2022
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8e7e63
demo: check if we are in a virtualenv before overriding PYTHONPATH
May 30, 2022
c0f252d
add changelog
May 30, 2022
98afe8f
Update changelog.d/12916.misc
May 30, 2022
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
1 change: 1 addition & 0 deletions changelog.d/12916.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
demo: check if we are in a virtualenv before overriding PYTHONPATH.
11 changes: 6 additions & 5 deletions demo/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down