From c27daf1f2c1101ea60ba80926359efcc34efbbdb Mon Sep 17 00:00:00 2001 From: eukub Date: Sun, 24 Dec 2023 21:33:47 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81hanged=20concatenation=20of=20strings=20t?= =?UTF-8?q?o=20f-strings=20to=20improve=20readability=20and=20unify=20with?= =?UTF-8?q?=20the=20rest=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- one_click.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/one_click.py b/one_click.py index 76e8580ecc..0e75f297b9 100644 --- a/one_click.py +++ b/one_click.py @@ -148,17 +148,17 @@ def run_cmd(cmd, assert_success=False, environment=False, capture_output=False, if environment: if is_windows(): conda_bat_path = os.path.join(script_dir, "installer_files", "conda", "condabin", "conda.bat") - cmd = "\"" + conda_bat_path + "\" activate \"" + conda_env_path + "\" >nul && " + cmd + cmd = f'"{conda_bat_path}" activate "{conda_env_path}" >nul && {cmd}' else: conda_sh_path = os.path.join(script_dir, "installer_files", "conda", "etc", "profile.d", "conda.sh") - cmd = ". \"" + conda_sh_path + "\" && conda activate \"" + conda_env_path + "\" && " + cmd + cmd = f'. "{conda_sh_path}" && conda activate "{conda_env_path}" && {cmd}' # Run shell commands result = subprocess.run(cmd, shell=True, capture_output=capture_output, env=env) # Assert the command ran successfully if assert_success and result.returncode != 0: - print("Command '" + cmd + "' failed with exit status code '" + str(result.returncode) + "'.\n\nExiting now.\nTry running the start/update script again.") + print(f"Command '{cmd}' failed with exit status code '{str(result.returncode)}'.\n\nExiting now.\nTry running the start/update script again.") sys.exit(1) return result @@ -269,7 +269,7 @@ def update_requirements(initial_installation=False): for i, extension in enumerate(extensions): print(f"\n\n--- [{i+1}/{len(extensions)}]: {extension}\n\n") extension_req_path = os.path.join("extensions", extension, "requirements.txt") - run_cmd("python -m pip install -r " + extension_req_path + " --upgrade", assert_success=False, environment=True) + run_cmd(f"python -m pip install -r {extension_req_path} --upgrade", assert_success=False, environment=True) elif initial_installation: print_big_message("Will not install extensions due to INSTALL_EXTENSIONS environment variable.") @@ -323,13 +323,13 @@ def update_requirements(initial_installation=False): for req in git_requirements: url = req.replace("git+", "") package_name = url.split("/")[-1].split("@")[0].rstrip(".git") - run_cmd("python -m pip uninstall -y " + package_name, environment=True) + run_cmd(f"python -m pip uninstall -y {package_name}", environment=True) print(f"Uninstalled {package_name}") # Make sure that API requirements are installed (temporary) extension_req_path = os.path.join("extensions", "openai", "requirements.txt") if os.path.exists(extension_req_path): - run_cmd("python -m pip install -r " + extension_req_path + " --upgrade", environment=True) + run_cmd(f"python -m pip install -r {extension_req_path} --upgrade", environment=True) # Install/update the project requirements run_cmd("python -m pip install -r temp_requirements.txt --upgrade", assert_success=True, environment=True)