From 785268efa64c9387c4a72fe7297485024c26a22f Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Sat, 12 Jul 2025 06:07:10 +0900 Subject: [PATCH] modified: By default, do not forcefully downgrade numpy to below version 2. I believe enough of a grace period has now been given. https://github.com/Comfy-Org/ComfyUI-Manager/issues/1981#issuecomment-3058772842 --- cm-cli.py | 8 +------- glob/manager_core.py | 2 +- glob/manager_util.py | 22 ++-------------------- prestartup_script.py | 8 +------- pyproject.toml | 2 +- 5 files changed, 6 insertions(+), 36 deletions(-) diff --git a/cm-cli.py b/cm-cli.py index 116f99ed..04043423 100644 --- a/cm-cli.py +++ b/cm-cli.py @@ -46,10 +46,7 @@ comfyui_manager_path = os.path.abspath(os.path.dirname(__file__)) cm_global.pip_blacklist = {'torch', 'torchaudio', 'torchsde', 'torchvision'} cm_global.pip_downgrade_blacklist = ['torch', 'torchaudio', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia'] -if sys.version_info < (3, 13): - cm_global.pip_overrides = {'numpy': 'numpy<2'} -else: - cm_global.pip_overrides = {} +cm_global.pip_overrides = {} if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_overrides.json")): with open(os.path.join(manager_util.comfyui_manager_path, "pip_overrides.json"), 'r', encoding="UTF-8", errors="ignore") as json_file: @@ -152,9 +149,6 @@ class Ctx: with open(core.manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file: cm_global.pip_overrides = json.load(json_file) - if sys.version_info < (3, 13): - cm_global.pip_overrides = {'numpy': 'numpy<2'} - if os.path.exists(core.manager_pip_blacklist_path): with open(core.manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f: for x in f.readlines(): diff --git a/glob/manager_core.py b/glob/manager_core.py index 003595ae..2323530b 100644 --- a/glob/manager_core.py +++ b/glob/manager_core.py @@ -43,7 +43,7 @@ import manager_downloader from node_package import InstalledNodePackage -version_code = [3, 33, 8] +version_code = [3, 34] version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '') diff --git a/glob/manager_util.py b/glob/manager_util.py index 35709426..99df15b7 100644 --- a/glob/manager_util.py +++ b/glob/manager_util.py @@ -412,32 +412,14 @@ class PIPFixer: if len(targets) > 0: for x in targets: - if sys.version_info < (3, 13): - cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}", "numpy<2"]) - subprocess.check_output(cmd, universal_newlines=True) + cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}"]) + subprocess.check_output(cmd, universal_newlines=True) logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}") except Exception as e: logging.error("[ComfyUI-Manager] Failed to restore opencv") logging.error(e) - # fix numpy - if sys.version_info >= (3, 13): - logging.info("[ComfyUI-Manager] In Python 3.13 and above, PIP Fixer does not downgrade `numpy` below version 2.0. If you need to force a downgrade of `numpy`, please use `pip_auto_fix.list`.") - else: - try: - np = new_pip_versions.get('numpy') - if cm_global.pip_overrides.get('numpy') == 'numpy<2': - if np is not None: - if StrictVersion(np) >= StrictVersion('2'): - cmd = make_pip_cmd(['install', "numpy<2"]) - subprocess.check_output(cmd , universal_newlines=True) - - logging.info("[ComfyUI-Manager] 'numpy' dependency were fixed") - except Exception as e: - logging.error("[ComfyUI-Manager] Failed to restore numpy") - logging.error(e) - # fix missing frontend try: # NOTE: package name in requirements is 'comfyui-frontend-package' diff --git a/prestartup_script.py b/prestartup_script.py index 67ff4347..f3e52ea4 100644 --- a/prestartup_script.py +++ b/prestartup_script.py @@ -121,17 +121,11 @@ read_uv_mode() security_check.security_check() check_file_logging() -if sys.version_info < (3, 13): - cm_global.pip_overrides = {'numpy': 'numpy<2'} -else: - cm_global.pip_overrides = {} +cm_global.pip_overrides = {} if os.path.exists(manager_pip_overrides_path): with open(manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file: cm_global.pip_overrides = json.load(json_file) - - if sys.version_info < (3, 13): - cm_global.pip_overrides['numpy'] = 'numpy<2' if os.path.exists(manager_pip_blacklist_path): diff --git a/pyproject.toml b/pyproject.toml index bf2090a4..eaa68b34 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "comfyui-manager" description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI." -version = "3.33.8" +version = "3.34" license = { file = "LICENSE.txt" } dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]