From 683a172ad8ec5d5c5508127ea8d8574576f08c8a Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Tue, 13 May 2025 03:04:27 +0900 Subject: [PATCH] modified: Added a feature to prevent numpy from being forcibly downgraded to below 2 via `pip_overrides.json`. https://github.com/Comfy-Org/ComfyUI-Manager/issues/1665#issuecomment-2862099191 --- glob/manager_core.py | 2 +- glob/manager_util.py | 12 +++++++----- pyproject.toml | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/glob/manager_core.py b/glob/manager_core.py index 4ee64b87..41906a6f 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, 32, 1] +version_code = [3, 32, 2] 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 84f485c0..2cc13bac 100644 --- a/glob/manager_util.py +++ b/glob/manager_util.py @@ -15,6 +15,7 @@ import re import logging import platform import shlex +import cm_global cache_lock = threading.Lock() @@ -422,12 +423,13 @@ class PIPFixer: # fix numpy try: np = new_pip_versions.get('numpy') - if np is not None: - if StrictVersion(np) >= StrictVersion('2'): - cmd = make_pip_cmd(['install', "numpy<2"]) - subprocess.check_output(cmd , universal_newlines=True) + 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") + logging.info("[ComfyUI-Manager] 'numpy' dependency were fixed") except Exception as e: logging.error("[ComfyUI-Manager] Failed to restore numpy") logging.error(e) diff --git a/pyproject.toml b/pyproject.toml index 783c1898..62ad9037 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.32.1" +version = "3.32.2" license = { file = "LICENSE.txt" } dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]