Use the correct python version when running jobs

bennettbot/dispatcher.py

@@ -89,7 +89,11 @@ def run_command(self):
             stdout_path=self.stdout_path,
             stderr_path=self.stdout_path,
         )
-
+        env = {**os.environ, "PYTHONPATH": settings.APPLICATION_ROOT}
+        bin_path = os.getenv("ABSOLUTE_BIN")
+        if bin_path and not env["PATH"].startswith(bin_path):  # pragma: no cover
+            # If we have an ABSOLUTE_BIN env variable, ensure that it's set first in the path
+            env["PATH"] = f"{bin_path}:{env['PATH']}"
         with open(self.stdout_path, "w") as stdout, open(
             self.stderr_path, "w"
         ) as stderr:
@@ -99,7 +103,7 @@ def run_command(self):
                     cwd=self.cwd,
                     stdout=stdout,
                     stderr=stderr,
-                    env={**os.environ, "PYTHONPATH": settings.APPLICATION_ROOT},
+                    env=env,
                     shell=True,
                 )
                 rc = rv.returncode

docker/entrypoints/prod.sh

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# Note: this is set as the default CMD in the Dockerfile
+# In production, dokku extracts the Procfile and uses the commands defined
+# there as the entrypoints, so this script is ignored in production. It is
+# used only if we're running the production service with docker compose
+# https://dokku.com/docs/processes/process-management/#procfile
+
 set -euo pipefail
 
 just run bot

justfile

@@ -7,6 +7,8 @@ export PIP := BIN + if os_family() == "unix" { "/python -m pip" } else { "/pytho
 
 export DEFAULT_PYTHON := if os_family() == "unix" { "python3.12" } else { "python" }
 
+export ABSOLUTE_BIN := `pwd` + "/" + BIN
+
 set dotenv-load := true
 
 

tests/job_configs.py

@@ -5,6 +5,9 @@
 raw_config = {
     "test": {
         "jobs": {
+            "python_version": {
+                "run_args_template": 'python -c "import platform; print(platform.python_version())"',
+            },
             "good_job": {
                 "run_args_template": "cat poem",
             },

tests/test_dispatcher.py

@@ -1,6 +1,8 @@
 import json
 import os
+import platform
 import shutil
+from pathlib import Path
 from unittest.mock import Mock, patch
 
 import httpretty
@@ -658,3 +660,20 @@ def test_message_checker_matched_messages(keyword, support_channel, reaction):
             "timestamp": ["100.3"],
         },
     ]
+
+
+def test_python_version():
+    # check that we are using the same python version in jobs as we are
+    # in this test
+    # this would previously fail in local test runs if the user's system
+    # python version was different from the venv python and they were
+    # running `just test` without manually activating the venv first
+    log_dir = build_log_dir("test_python_version")
+
+    scheduler.schedule_job("test_python_version", {}, "channel", TS, 0)
+    job = scheduler.reserve_job()
+
+    do_job(slack_web_client(), job)
+
+    version_in_job = (Path(log_dir) / "stdout").read_text().strip()
+    assert version_in_job == platform.python_version()