move venv launch function to utils

Author: mracsys

CI.py

@@ -18,8 +18,7 @@
 from Messages import ITEM_MESSAGES, IMPORTANT_ITEM_MESSAGES, MISC_MESSAGES
 from SettingsList import SettingInfos, logic_tricks, validate_settings
 import Unittest as Tests
-from Utils import data_path
-from Gui import ensure_venv
+from Utils import data_path, ensure_venv
 
 
 def error(msg: str, can_fix: bool) -> None:

Gui.py

@@ -10,50 +10,12 @@
     input("Press enter to exit...")
     sys.exit(1)
 
-import os
-import platform
 import shutil
 import subprocess
-import venv
 import webbrowser
 
 from SettingsToJson import create_settings_list_json
-from Utils import local_path, data_path, compare_version, VersionError
-
-
-VENV_DIR = local_path(".venv")
-PYTHON_BIN = os.path.abspath(os.path.join(VENV_DIR, "bin", "python3"))
-if platform.system() == 'Windows':
-    PYTHON_BIN = os.path.abspath(os.path.join(VENV_DIR, "Scripts", "python.exe"))
-REQUIREMENTS = local_path("requirements.txt")
-
-
-def ensure_venv():
-    # If venv doesn’t exist, create it
-    if not os.path.exists(PYTHON_BIN):
-        print("Creating virtual environment...")
-        venv.create(VENV_DIR, with_pip=True)
-    requirements_not_met = False
-    if '--no-pip' not in sys.argv:
-        # Running pip twice lets us both capture output cleanly to see if
-        # we need to reload the venv and send output live to the user on
-        # actual install.
-        print("Checking for required python dependencies")
-        req_check = subprocess.run([PYTHON_BIN, "-m", "pip", "install", "-r", REQUIREMENTS, "--dry-run"], capture_output=True, text=True)
-        if req_check.returncode != 0:
-            raise ImportError(f"pip failed to verify required dependencies:\n{req_check.stderr}")
-        requirements_not_met = "collecting " in req_check.stdout.lower()
-        if requirements_not_met:
-            print("Installing missing python dependencies")
-            req_check = subprocess.run([PYTHON_BIN, "-m", "pip", "install", "-r", REQUIREMENTS], capture_output=True, text=True)
-            if req_check.returncode != 0:
-                raise ImportError(f"pip failed to install required dependencies:\n{req_check.stderr}")
-
-    # If we're not already running inside the venv, restart with it
-    if sys.executable != PYTHON_BIN or requirements_not_met:
-        print('Re-launching in virtual environment')
-        subprocess.check_call([PYTHON_BIN] + sys.argv + ['--no-pip'])
-        sys.exit(0)
+from Utils import local_path, data_path, compare_version, ensure_venv, VersionError
 
 
 def gui_main() -> None:

OoTRandomizer.py

@@ -9,7 +9,7 @@
 import os
 import time
 
-from Gui import ensure_venv
+from Utils import ensure_venv
 
 def start() -> None:
     ensure_venv()

Utils.py

@@ -3,10 +3,12 @@
 import json
 import logging
 import os
+import platform
 import re
 import subprocess
 import sys
 import urllib.request
+import venv
 from collections.abc import Sequence
 from itertools import chain, combinations
 from typing import AnyStr, Optional, Any
@@ -235,3 +237,37 @@ def powerset(iterable):
     "powerset([1,2,3]) --> () (1,) (2,) (3,) (1,2) (1,3) (2,3) (1,2,3)"
     s = list(iterable)
     return chain.from_iterable(combinations(s, r) for r in range(len(s)+1))
+
+
+def ensure_venv():
+    VENV_DIR = local_path(".venv")
+    PYTHON_BIN = os.path.abspath(os.path.join(VENV_DIR, "bin", "python3"))
+    if platform.system() == 'Windows':
+        PYTHON_BIN = os.path.abspath(os.path.join(VENV_DIR, "Scripts", "python.exe"))
+    REQUIREMENTS = local_path("requirements.txt")
+
+    # If venv doesn’t exist, create it
+    if not os.path.exists(PYTHON_BIN):
+        print("Creating virtual environment...")
+        venv.create(VENV_DIR, with_pip=True)
+    requirements_not_met = False
+    if '--no-pip' not in sys.argv:
+        # Running pip twice lets us both capture output cleanly to see if
+        # we need to reload the venv and send output live to the user on
+        # actual install.
+        print("Checking for required python dependencies")
+        req_check = subprocess.run([PYTHON_BIN, "-m", "pip", "install", "-r", REQUIREMENTS, "--dry-run"], capture_output=True, text=True)
+        if req_check.returncode != 0:
+            raise ImportError(f"pip failed to verify required dependencies:\n{req_check.stderr}")
+        requirements_not_met = "collecting " in req_check.stdout.lower()
+        if requirements_not_met:
+            print("Installing missing python dependencies")
+            req_check = subprocess.run([PYTHON_BIN, "-m", "pip", "install", "-r", REQUIREMENTS], capture_output=True, text=True)
+            if req_check.returncode != 0:
+                raise ImportError(f"pip failed to install required dependencies:\n{req_check.stderr}")
+
+    # If we're not already running inside the venv, restart with it
+    if sys.executable != PYTHON_BIN or requirements_not_met:
+        print('Re-launching in virtual environment')
+        subprocess.check_call([PYTHON_BIN] + sys.argv + ['--no-pip'])
+        sys.exit(0)