Merge branch 'fixed-python' into pre-kickstart-SR2026

Author: WillB97

.gitignore

@@ -167,3 +167,4 @@ cython_debug/
 /simulator/controllers/competition_supervisor/runtime.ini
 /zone_*
 /dist
+/uv.lock

scripts/generate_release.py

@@ -85,6 +85,7 @@
     script_dir = temp_dir / "scripts"
     script_dir.mkdir()
     shutil.copy(project_root / "scripts/run_comp_match.py", script_dir)
+    shutil.copy(project_root / "scripts/setup_python_fix.py", script_dir)
 
     logger.info("Copying example code to temp directory")
     shutil.copytree(project_root / "example_robots", temp_dir / "example_robots")

scripts/setup.py

@@ -16,7 +16,6 @@
 import sys
 from pathlib import Path
 from subprocess import SubprocessError, check_call
-from venv import create
 
 logging.basicConfig(level=logging.INFO, format="[%(asctime)s] %(levelname)s: %(message)s")
 logger = logging.getLogger(__name__)
@@ -84,7 +83,7 @@ def populate_python_config(runtime_ini: Path, venv_python: Path) -> None:
     (venv_dir / "setup_success").unlink(missing_ok=True)
 
     logger.info(f"Creating virtual environment in {venv_dir.absolute()}")
-    create(venv_dir, with_pip=True)
+    check_call([sys.executable, "-m", "venv", venv_dir])
 
     logger.info(f"Installing dependencies from {requirements.absolute()}")
     if platform.system() == "Windows":

scripts/setup_python_fix.py

@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+"""
+A script to setup the environment for running the project in Webots.
+
+It will:
+1. Create a setup virtual environment and install uv into it
+2. Use uv to run the standard setup using the desired Python version
+"""
+import logging
+import platform
+import sys
+from pathlib import Path
+from subprocess import SubprocessError, check_call
+
+logging.basicConfig(level=logging.INFO, format="[%(asctime)s] %(levelname)s: %(message)s")
+logger = logging.getLogger(__name__)
+
+BOLD_RED = '\x1b[31;1m'
+GREEN = '\x1b[32;20m'
+RESET_COLOUR = '\x1b[0m'
+
+PYTHON_VERSION = "3.11"
+
+try:
+    if (Path(__file__).parent / 'simulator/VERSION').exists():
+        # This is running from a release
+        print("Running in release mode")
+        project_root = Path(__file__).parent
+    else:
+        # This is running from the repository
+        print("Running in development mode")
+        project_root = Path(__file__).parents[1]
+
+    print(f"Starting with python version: {sys.version} on {platform.platform()}")
+
+    venv_dir = project_root / "simulator/setup_venv"
+    script_dir = Path(__file__).parent
+
+    check_call([sys.executable, "-m", "venv", venv_dir])
+
+    logger.info("Installing uv")
+    if platform.system() == "Windows":
+        venv_bin_dir = venv_dir / "Scripts"
+        pip = venv_bin_dir / "pip.exe"
+        uv_bin = venv_bin_dir / "uv.exe"
+    else:
+        venv_bin_dir = venv_dir / "bin"
+        pip = venv_bin_dir / "pip"
+        uv_bin = venv_bin_dir / "uv"
+
+    check_call(
+        [pip, "install", "--only-binary=:all:", "--upgrade", "wheel", "uv"],
+        cwd=venv_dir,
+    )
+
+    logger.info(f"Running setup using Python {PYTHON_VERSION}")
+    setup_script = script_dir.relative_to(project_root) / "setup.py"
+    check_call([uv_bin, "run", "--python", PYTHON_VERSION, setup_script], cwd=project_root)
+except SubprocessError:
+    print(BOLD_RED)
+    logger.error("Setup failed due to an error.")
+    input(f"An error occurred, press enter to close.{RESET_COLOUR}")
+except Exception:
+    print(BOLD_RED)
+    logger.exception("Setup failed due to an error.")
+    input(f"An error occurred, press enter to close.{RESET_COLOUR}")