use another approach to set custom path

ls1intum · Aug 12, 2024 · fcdc7e0 · fcdc7e0
1 parent f38f3ae
commit fcdc7e0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/scripts/install_modules.py b/scripts/install_modules.py
@@ -18,16 +18,17 @@ def main():
     ]
 
     success = True
+    path_env = os.environ["PATH"]
 
     for module in modules:
         if os.path.isdir(module):
 
-            venv_path = os.path.join(os.getcwd(), module, ".venv")
+            path = os.path.join(os.getcwd(), module, ".venv")
+            os.environ["VIRTUAL_ENV"] = path
+            os.environ["PATH"] = os.path.join(path, "bin") + os.pathsep + path_env
 
-            env = os.environ.copy()
-            env["POETRY_VIRTUALENVS_PATH"] = venv_path
-
-            result = subprocess.run(["poetry", "install"], cwd=module, env=env)
+            subprocess.run([sys.executable, "-m", "venv", path])
+            result = subprocess.run(["poetry", "install"], cwd=path)
 
             if result.returncode != 0:
                 success = False

diff --git a/scripts/lint_modules.py b/scripts/lint_modules.py
@@ -18,18 +18,18 @@ def main():
     ]
 
     success = True
+    path_env = os.environ["PATH"]
 
     for module in modules:
         if os.path.isdir(module):
 
-            venv_path = os.path.join(os.getcwd(), module, ".venv")
-
-            env = os.environ.copy()
-            env["POETRY_VIRTUALENVS_PATH"] = venv_path
+            path = os.path.join(os.getcwd(), module, ".venv")
+            os.environ["VIRTUAL_ENV"] = path
+            os.environ["PATH"] = os.path.join(path, "bin") + os.pathsep + path_env
 
             result = subprocess.run(["poetry", "run", "prospector", "--profile",
                                      os.path.abspath(os.path.join(os.path.dirname(__file__), "../.prospector.yaml"))],
-                                    cwd=module, env=env)
+                                    cwd=module)
             if result.returncode != 0:
                 success = False