From a2b628b9548edfdfd918df31302f8c66df6c3c01 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 6 Mar 2025 20:11:17 -0600 Subject: [PATCH 1/3] PYTHON-5192 Fix run-server usage --- .evergreen/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 3f29391373..17c825d957 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -208,7 +208,7 @@ functions: working_dir: "src" include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE, STORAGE_ENGINE, REQUIRE_API_VERSION, DRIVERS_TOOLS, TEST_CRYPT_SHARED, AUTH_AWS, LOAD_BALANCER] - args: [.evergreen/just.sh, run-server, "${TEST_NAME}", "${SUB_TEST_NAME}"] + args: [.evergreen/just.sh, run-server, "${TEST_NAME}"] - command: expansions.update params: file: ${DRIVERS_TOOLS}/mo-expansion.yml From 45d32da31f8f2855efe94028b8209f54428e1531 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 6 Mar 2025 20:34:46 -0600 Subject: [PATCH 2/3] debug --- .evergreen/scripts/run-mod-wsgi-tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.evergreen/scripts/run-mod-wsgi-tests.sh b/.evergreen/scripts/run-mod-wsgi-tests.sh index 607458b8c6..f59ace8116 100755 --- a/.evergreen/scripts/run-mod-wsgi-tests.sh +++ b/.evergreen/scripts/run-mod-wsgi-tests.sh @@ -22,7 +22,8 @@ PYTHON_VERSION=$(${PYTHON_BINARY} -c "import sys; sys.stdout.write('.'.join(str( ${PYTHON_BINARY} -m venv --system-site-packages .venv source .venv/bin/activate pip install -U pip -python -m pip install -e . +export PYMONGO_C_EXT_MUST_BUILD=1 +python -m pip install -v -e . export MOD_WSGI_SO=/opt/python/mod_wsgi/python_version/$PYTHON_VERSION/mod_wsgi_version/$MOD_WSGI_VERSION/mod_wsgi.so export PYTHONHOME=/opt/python/$PYTHON_VERSION From 9474a8ab1261cc6e69f3517f4126f98ac903fa1e Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Thu, 6 Mar 2025 20:49:24 -0600 Subject: [PATCH 3/3] set PYTHON_BINARY --- .evergreen/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 17c825d957..3f498ba3fa 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -206,7 +206,7 @@ functions: params: binary: bash working_dir: "src" - include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE, + include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE, PYTHON_BINARY, STORAGE_ENGINE, REQUIRE_API_VERSION, DRIVERS_TOOLS, TEST_CRYPT_SHARED, AUTH_AWS, LOAD_BALANCER] args: [.evergreen/just.sh, run-server, "${TEST_NAME}"] - command: expansions.update