From 1a2583c92a949b8f737d798c9c19e3cf1ab57cf7 Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Mon, 10 Feb 2025 15:39:27 -0800 Subject: [PATCH 1/6] Remove standalone tests. --- .github/workflows/test-mac.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml index 8b35107..2873fa7 100644 --- a/.github/workflows/test-mac.yml +++ b/.github/workflows/test-mac.yml @@ -28,6 +28,4 @@ jobs: python -m pip install --upgrade pip pip install -e . comfy --skip-prompt --workspace ./ComfyUI install --fast-deps --m-series --skip-manager - comfy --workspace ./ComfyUI standalone --platform macos - comfy standalone --rehydrate ./python/bin/python ComfyUI/main.py --cpu --quick-test-for-ci From fcf28f6e4ce9b23a88a485e28f0650f2d93a30d5 Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Mon, 10 Feb 2025 15:39:30 -0800 Subject: [PATCH 2/6] Remove. --- .github/workflows/test-windows.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index ecb1fc0..0e312fe 100755 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -30,7 +30,4 @@ jobs: pip install pytest pip install -e . comfy --skip-prompt --workspace ./ComfyUI install --fast-deps --nvidia --cuda-version 12.6 --skip-manager - comfy --workspace ./ComfyUI standalone --platform windows --proc x86_64 - ls - comfy standalone --rehydrate --platform windows --proc x86_64 ./python/python.exe ComfyUI/main.py --cpu --quick-test-for-ci From 13a02f2f141d3eda124210f5bbafc80c2438bc6c Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Mon, 10 Feb 2025 16:00:06 -0800 Subject: [PATCH 3/6] Fix return code for comfy launch. --- comfy_cli/command/launch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comfy_cli/command/launch.py b/comfy_cli/command/launch.py index b188100..52885e6 100644 --- a/comfy_cli/command/launch.py +++ b/comfy_cli/command/launch.py @@ -48,7 +48,7 @@ def launch_comfyui(extra): exit(res) if not os.path.exists(reboot_path): - exit(res) + exit(res.returncode) os.remove(reboot_path) else: From 6ee874eea2066bc522889692fa099667d4124ad8 Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Mon, 10 Feb 2025 16:00:40 -0800 Subject: [PATCH 4/6] Use comfy launch. --- .github/workflows/test-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 0e312fe..a13b14d 100755 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -30,4 +30,4 @@ jobs: pip install pytest pip install -e . comfy --skip-prompt --workspace ./ComfyUI install --fast-deps --nvidia --cuda-version 12.6 --skip-manager - ./python/python.exe ComfyUI/main.py --cpu --quick-test-for-ci + comfy --here launch -- --cpu --quick-test-for-ci From af06fd72250b0fb44b02772b9c28f445e3800c20 Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Mon, 10 Feb 2025 16:03:02 -0800 Subject: [PATCH 5/6] Fix tests for mac. --- .github/workflows/test-mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml index 2873fa7..c4ea246 100644 --- a/.github/workflows/test-mac.yml +++ b/.github/workflows/test-mac.yml @@ -28,4 +28,4 @@ jobs: python -m pip install --upgrade pip pip install -e . comfy --skip-prompt --workspace ./ComfyUI install --fast-deps --m-series --skip-manager - ./python/bin/python ComfyUI/main.py --cpu --quick-test-for-ci + comfy --here launch -- --cpu --quick-test-for-ci From 820435c4e4db6c584394d8fb887ca84732f9d63d Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Mon, 10 Feb 2025 15:36:56 -0800 Subject: [PATCH 6/6] Use keyword arguments for cm-cli. --- comfy_cli/command/custom_nodes/command.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/comfy_cli/command/custom_nodes/command.py b/comfy_cli/command/custom_nodes/command.py index b536eaa..06001b8 100644 --- a/comfy_cli/command/custom_nodes/command.py +++ b/comfy_cli/command/custom_nodes/command.py @@ -392,7 +392,7 @@ def install( ), ] = None, fast_deps: Annotated[ - Optional[bool], + bool, typer.Option( "--fast-deps", show_default=False, @@ -649,7 +649,7 @@ def install_deps( execute_cm_cli( ["deps-in-workflow", "--workflow", workflow, "--output", tmp_path], channel, - mode, + mode=mode, ) deps_file = tmp_path @@ -689,7 +689,7 @@ def deps_in_workflow( execute_cm_cli( ["deps-in-workflow", "--workflow", workflow, "--output", output], channel, - mode, + mode=mode, )