Merge branch 'master' into test_resolve_conflicts

1 files changed, 4 insertions, 2 deletions

diff --git a/launch.py b/launch.py
index 16627a03..537670a3 100644
--- a/launch.py
+++ b/launch.py
@@ -9,6 +9,7 @@ import platform
 dir_repos = "repositories"

 python = sys.executable

 git = os.environ.get('GIT', "git")

+index_url = os.environ.get('INDEX_URL', "")

 

 

 def extract_arg(args, name):

@@ -57,7 +58,8 @@ def run_python(code, desc=None, errdesc=None):
 

 

 def run_pip(args, desc=None):

-    return run(f'"{python}" -m pip {args} --prefer-binary', desc=f"Installing {desc}", errdesc=f"Couldn't install {desc}")

+    index_url_line = f' --index-url {index_url}' if index_url != '' else ''

+    return run(f'"{python}" -m pip {args} --prefer-binary{index_url_line}', desc=f"Installing {desc}", errdesc=f"Couldn't install {desc}")

 

 

 def check_run_python(code):

@@ -76,7 +78,7 @@ def git_clone(url, dir, name, commithash=None):
             return

 

         run(f'"{git}" -C {dir} fetch', f"Fetching updates for {name}...", f"Couldn't fetch {name}")

-        run(f'"{git}" -C {dir} checkout {commithash}', f"Checking out commint for {name} with hash: {commithash}...", f"Couldn't checkout commit {commithash} for {name}")

+        run(f'"{git}" -C {dir} checkout {commithash}', f"Checking out commit for {name} with hash: {commithash}...", f"Couldn't checkout commit {commithash} for {name}")

         return

 

     run(f'"{git}" clone "{url}" "{dir}"', f"Cloning {name} into {dir}...", f"Couldn't clone {name}")