Skip to content

Commit

Permalink
reqFile should be a list of paths. (#164)
Browse files Browse the repository at this point in the history
* reqFile should be a list of paths.

* Add final newline.
  • Loading branch information
robinjhuang committed Aug 27, 2024
1 parent c0593e6 commit 743f8bc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,6 @@ venv/

bisect_state.json
python*
cpython*
cpython*
requirements.compiled
override.txt
16 changes: 8 additions & 8 deletions comfy_cli/uv.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ def __init__(
extraSpecs (Optional[list[str]]): list of extra Python requirement specifiers to be included in the compilation
"""
self.cwd = Path(cwd).expanduser().resolve()
self.outDir = Path(outDir).expanduser().resolve()
self.outDir: Path = Path(outDir).expanduser().resolve()
# use .absolute since .resolve breaks the softlink-is-interpreter assumption of venvs
self.executable = Path(executable).expanduser().absolute()
self.gpu = DependencyCompiler.Resolve_Gpu(gpu)
Expand All @@ -343,7 +343,7 @@ def __init__(
DependencyCompiler.rocmPytorchUrl if self.gpu == GPU_OPTION.AMD else
None
) # fmt: skip
self.out = self.outDir / outName
self.out: Path = self.outDir / outName
self.override = self.outDir / "override.txt"

self.reqFilesCore = reqFilesCore if reqFilesCore is not None else self.find_core_reqs()
Expand Down Expand Up @@ -441,7 +441,7 @@ def compile_deps(self):
def install_deps(self):
DependencyCompiler.Install(
cwd=self.cwd,
reqFile=self.out,
reqFile=[self.out],
executable=self.executable,
extra_index_url=self.gpuUrl,
override=self.override,
Expand All @@ -450,7 +450,7 @@ def install_deps(self):
def install_dists(self):
DependencyCompiler.Install(
cwd=self.cwd,
reqFile=self.out,
reqFile=[self.out],
executable=self.executable,
find_links=[self.outDir / "dists"],
no_deps=True,
Expand All @@ -464,7 +464,7 @@ def install_wheels(self):
find_links=[self.outDir / "wheels"],
no_deps=True,
no_index=True,
reqFile=self.out,
reqFile=[self.out],
)

def install_wheels_directly(self):
Expand All @@ -479,15 +479,15 @@ def install_wheels_directly(self):
def sync_core_plus_ext(self):
DependencyCompiler.Sync(
cwd=self.cwd,
reqFile=self.out,
reqFile=[self.out],
executable=self.executable,
extraUrl=self.gpuUrl,
)

def fetch_dep_dists(self):
DependencyCompiler.Download(
cwd=self.cwd,
reqFile=self.out,
reqFile=[self.out],
executable=self.executable,
extraUrl=self.gpuUrl,
noDeps=True,
Expand All @@ -497,7 +497,7 @@ def fetch_dep_dists(self):
def fetch_dep_wheels(self):
DependencyCompiler.Wheel(
cwd=self.cwd,
reqFile=self.out,
reqFile=[self.out],
executable=self.executable,
extraUrl=self.gpuUrl,
noDeps=True,
Expand Down

0 comments on commit 743f8bc

Please sign in to comment.