MOTOR-1104 Windows and MacOS Tox failures (#198)

mongodb · Mar 16, 2023 · da92e56 · da92e56
1 parent 935c543
commit da92e56
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -403,6 +403,9 @@ functions:
           set -x
           export LIBMONGOCRYPT_URL="${libmongocrypt_url}"
           export TEST_ENCRYPTION=1
+          if [ -n "${EXTRA_PATH}" ]; then
+            export PATH="${EXTRA_PATH}:$PATH"
+          fi
           PYTHON_BINARY="${PYTHON_BINARY}" \
           TOX_BINARY="${TOX_BINARY}" \
           TOX_ENV="${TOX_ENV}" \
@@ -878,30 +881,30 @@ axes:
   - id: tox-env-osx
     display_name: "Tox Env OSX"
     values:
-      - id: "tornado5-py38"
+      - id: "tornado5"
         variables:
-           TOX_ENV: "tornado5-py38"
-           PYTHON_BINARY: "/Library/Frameworks/Python.framework/Versions/3.8/bin/python3"
-      - id: "tornado_git-py38"
+           TOX_ENV: "tornado5"
+           EXTRA_PATH: "/Library/Frameworks/Python.framework/Versions/3.8/bin/"
+      - id: "tornado_git"
         variables:
-           TOX_ENV: "tornado_git-py38"
-           PYTHON_BINARY: "/Library/Frameworks/Python.framework/Versions/3.8/bin/python3"
+           TOX_ENV: "tornado_git"
+           EXTRA_PATH: "/Library/Frameworks/Python.framework/Versions/3.8/bin/"
 
   - id: tox-env-win
     display_name: "Tox Env Windows"
     values:
-      - id: "asyncio-py37"
+      - id: "asyncio"
         variables:
-          TOX_ENV: "asyncio-py37"
-          PYTHON_BINARY: "c:\\python\\Python37\\python.exe"
-      - id: "tornado6-py37"
+          TOX_ENV: "asyncio"
+          EXTRA_PATH: "c:\\python\\Python37"
+      - id: "tornado6"
         variables:
-           TOX_ENV: "tornado6-py37"
-           PYTHON_BINARY: "c:\\python\\Python37\\python.exe"
-      - id: "tornado6-py38"
+           TOX_ENV: "tornado6"
+           EXTRA_PATH: "c:\\python\\Python37"
+      - id: "tornado6"
         variables:
-           TOX_ENV: "tornado6-py38"
-           PYTHON_BINARY: "c:\\python\\Python38\\python.exe"
+           TOX_ENV: "tornado6"
+           EXTRA_PATH: "c:\\python\\Python38"
 
   - id: os
     display_name: "Operating System"