mirror of
https://github.com/Comfy-Org/ComfyUI.git
synced 2026-08-24 18:10:27 +08:00
Read .comfy_environment from ComfyUI install dir, not --base-directory
folder_paths.base_path is overridden by --base-directory to a user-supplied location. Launchers/installers write the .comfy_environment marker next to the ComfyUI install itself, so reading from base_path would silently fall back to 'local-git' whenever --base-directory is in use, defeating the purpose of the env header. Amp-Thread-ID: https://ampcode.com/threads/T-019df554-0cf8-755a-9f84-674e974aa5d1 Co-authored-by: Amp <amp@ampcode.com>
This commit is contained in:
@@ -4,15 +4,15 @@ import os
|
||||
|
||||
import pytest
|
||||
|
||||
from comfy import deploy_environment
|
||||
from comfy.deploy_environment import get_deploy_environment
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def _reset_cache_and_base_path(tmp_path, monkeypatch):
|
||||
"""Reset the functools cache and point folder_paths.base_path at a tmp dir for each test."""
|
||||
def _reset_cache_and_install_dir(tmp_path, monkeypatch):
|
||||
"""Reset the functools cache and point the ComfyUI install dir at a tmp dir for each test."""
|
||||
get_deploy_environment.cache_clear()
|
||||
import folder_paths
|
||||
monkeypatch.setattr(folder_paths, "base_path", str(tmp_path))
|
||||
monkeypatch.setattr(deploy_environment, "_COMFY_INSTALL_DIR", str(tmp_path))
|
||||
yield
|
||||
get_deploy_environment.cache_clear()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user