Skip to content

refactor(uv): delete dead 'dists' packaging path (BE-4351) #592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattmillerai wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −79
Open

refactor(uv): delete dead 'dists' packaging path (BE-4351) #592

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 0 additions & 79 deletions comfy_cli/uv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,42 +324,6 @@ def Sync(

return _check_call(cmd, cwd)

@staticmethod
def Download(
cwd: PathLike,
executable: PathLike = sys.executable,
extraUrl: str | None = None,
noDeps: bool = False,
out: PathLike | None = None,
reqs: list[str] | None = None,
reqFile: list[PathLike] | None = None,
) -> None:
"""For now, the `download` cmd has no uv support, so use pip"""
cmd = [
str(executable),
"-m",
"pip",
"download",
]

if extraUrl is not None:
cmd.extend(["--extra-index-url", extraUrl])

if noDeps:
cmd.append("--no-deps")

if out is not None:
cmd.extend(["-d", str(out)])

if reqs is not None:
cmd.extend(reqs)

if reqFile is not None:
for rf in reqFile:
cmd.extend(["--requirement", rf])

return _check_call(cmd, cwd)

@staticmethod
def Wheel(
cwd: PathLike,
Expand Down Expand Up @@ -577,26 +541,6 @@ def install_deps(self):
reqFile=[self.out],
)

def install_dists(self):
DependencyCompiler.Install(
cwd=self.cwd,
executable=self.executable,
find_links=[self.outDir / "dists"],
no_deps=True,
no_index=True,
reqFile=[self.out],
)

def install_wheels(self):
DependencyCompiler.Install(
cwd=self.cwd,
executable=self.executable,
find_links=[self.outDir / "wheels"],
no_deps=True,
no_index=True,
reqFile=[self.out],
)

def install_wheels_directly(self):
DependencyCompiler.Install(
cwd=self.cwd,
Expand All @@ -606,29 +550,6 @@ def install_wheels_directly(self):
reqs=(self.outDir / "wheels").glob("*.whl"),
)

def sync_core_plus_ext(self):
DependencyCompiler.Sync(
cwd=self.cwd,
reqFile=[self.out],
executable=self.executable,
extraUrl=self.gpuUrl,
)

def fetch_dep_dists(self, skip_uv: bool = False):
skips = ["uv"] if skip_uv else None
reqs = parse_req_file(self.out, skips=skips)

extraUrl = None if "--extra-index-url" in reqs else self.gpuUrl

DependencyCompiler.Download(
cwd=self.cwd,
executable=self.executable,
extraUrl=extraUrl,
noDeps=True,
out=self.outDir / "dists",
reqs=reqs,
)

def fetch_dep_wheels(self, skip_uv: bool = False):
skips = ["uv"] if skip_uv else None
reqs = parse_req_file(self.out, skips=skips)
Expand Down
Loading