diff options
| author | Juan Gu <juan.gu@mongodb.com> | 2023-05-02 16:49:07 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-05-02 17:10:20 +0000 |
| commit | 5adeacd869532c22e5cac6e58d40a9df37f75719 (patch) | |
| tree | a58c3a5835ab6d1f43f75c328a19e3783d938787 | |
| parent | 5040d6260e8ee1ebbe7b1db7189a16bc572caf8b (diff) | |
| download | mongo-5adeacd869532c22e5cac6e58d40a9df37f75719.tar.gz | |
Revert "SERVER-75626 added venv site-packages path to sys.path at macos host"
This reverts commit dfab5c3daef6f4fed0054f8b3e804300050a3868.
| -rw-r--r-- | etc/pip/components/idl.req | 1 | ||||
| -rw-r--r-- | etc/pip/components/lint.req | 1 | ||||
| -rw-r--r-- | evergreen/prelude_venv.sh | 5 |
3 files changed, 2 insertions, 5 deletions
diff --git a/etc/pip/components/idl.req b/etc/pip/components/idl.req index 13ad323f0cd..0b0ef8924b2 100644 --- a/etc/pip/components/idl.req +++ b/etc/pip/components/idl.req @@ -1,2 +1,3 @@ unittest-xml-reporting >= 2.2.0, <= 3.0.4 +typing <= 3.7.4.3 packaging <= 21.3 diff --git a/etc/pip/components/lint.req b/etc/pip/components/lint.req index e50b2841d1c..a517075f717 100644 --- a/etc/pip/components/lint.req +++ b/etc/pip/components/lint.req @@ -5,6 +5,7 @@ mypy < 0.900; python_version > "3.5" pydocstyle == 2.1.1 pylint == 2.7.2 structlog ~= 19.2.0 +typing <= 3.7.4.3 yamllint == 1.15.0 yapf == 0.26.0 evergreen-lint == 0.1.3 diff --git a/evergreen/prelude_venv.sh b/evergreen/prelude_venv.sh index a4e9318375e..c5442c57659 100644 --- a/evergreen/prelude_venv.sh +++ b/evergreen/prelude_venv.sh @@ -22,11 +22,6 @@ function activate_venv { if [ "Windows_NT" = "$OS" ]; then export PYTHONPATH="$PYTHONPATH;$(cygpath -w ${workdir}/src)" - elif [ "$(uname)" = "Darwin" ]; then - #SERVER-75626 After activating the virtual environment under the mocos host. the PYTHONPATH setting - #is incorrect, and the site-packages directory of the virtual environment cannot be found in the sys.path. - python_version=$($python -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")') - export PYTHONPATH="${workdir}/venv/lib/python${python_version}/site-packages:${PYTHONPATH}:${workdir}/src" else python_version=$($python -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")') site_packages="${workdir}/venv/lib/python${python_version}/site-packages" |