diff options
| author | Richard Samuels <richard.l.samuels@gmail.com> | 2021-05-18 16:19:17 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-05-27 18:26:29 +0000 |
| commit | 6135750dab50a54e40929913fa043d33f2d6f26e (patch) | |
| tree | b6ee72b6b72ed152d2c35b71517ef524d7ff301d /evergreen/functions | |
| parent | d7c69eb4c0453f77047fcc95ed4ab76a6580718c (diff) | |
| download | mongo-6135750dab50a54e40929913fa043d33f2d6f26e.tar.gz | |
SERVER-57047 Remove requirement to specify workdir when subprocess.exec'ing shell scripts
Diffstat (limited to 'evergreen/functions')
| -rw-r--r-- | evergreen/functions/venv_setup.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/evergreen/functions/venv_setup.sh b/evergreen/functions/venv_setup.sh index 7eb6c3d14a2..0a901296aee 100644 --- a/evergreen/functions/venv_setup.sh +++ b/evergreen/functions/venv_setup.sh @@ -1,10 +1,11 @@ # exit immediately if virtualenv is not found set -o errexit -evergreen_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" -. "$evergreen_dir/../prelude_python.sh" +evergreen_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)/.." +. "$evergreen_dir/prelude_workdir.sh" +. "$evergreen_dir/prelude_python.sh" -python_loc=$(which ${python:-/opt/mongodbtoolchain/v3/bin/python3}) +python_loc=$(which ${python}) venv_dir="${workdir}/venv" if [ -d "$venv_dir" ]; then exit 0 @@ -34,7 +35,7 @@ toolchain_txt="$pip_dir/toolchain-requirements.txt" # the whole prelude cannot be imported because it requires pyyaml to be # installed, which happens just below. -. "$evergreen_dir/../prelude_venv.sh" +. "$evergreen_dir/prelude_venv.sh" activate_venv echo "Upgrading pip to 21.0.1" |