Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(installer): more reliably upgrade pip

Browse Source
This commit is contained in:
Eugene Brodsky 2024-02-06 09:35:24 -05:00 committed by Kent Keirsey
parent 31b9538976
commit 3d1b5c57ea
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
installer/lib/installer.py
View File

@ -73,7 +73,7 @@ class Installer:
try:
# upgrade pip to the latest version to avoid a confusing message
res = subprocess.check_output([pip, "install", "--upgrade", "pip"]).decode()
res = upgrade_pip(Path(venv_dir.name))
if verbose:
print(res)
@ -169,6 +169,7 @@ class InvokeAiInstance:
set_sys_path(venv)
os.environ["INVOKEAI_ROOT"] = str(self.runtime.expanduser().resolve())
os.environ["VIRTUAL_ENV"] = str(self.venv.expanduser().resolve())
upgrade_pip(venv)
def get(self) -> tuple[Path, Path]:
"""
@ -218,7 +219,6 @@ class InvokeAiInstance:
from plumbum import FG, ProcessExecutionError, local # type: ignore
pip = local[self.pip]
_ = pip["install", "--upgrade", "pip"] & FG
pipeline = pip[
"install",
@ -330,6 +330,23 @@ def get_pip_from_venv(venv_path: Path) -> str:
return str(venv_path.expanduser().resolve() / pip)
def upgrade_pip(venv_path: Path) -> str | None:
"""
Upgrade the pip executable in the given virtual environment
"""
python = "Scripts\\python.exe" if OS == "Windows" else "bin/python"
python = str(venv_path.expanduser().resolve() / python)
try:
result = subprocess.check_output([python, "-m", "pip", "install", "--upgrade", "pip"]).decode()
except subprocess.CalledProcessError as e:
print(e)
result = None
return result
def set_sys_path(venv_path: Path) -> None:
"""
Given a path to a virtual environment, set the sys.path, in a cross-platform fashion,