From 35285dd74b6a2c50e25c5b9d346e133f57bfb469 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Sun, 4 Aug 2024 02:03:42 +0900 Subject: [PATCH] fix: is_installed - consider `--index-url` pattern --- glob/manager_core.py | 6 +++--- prestartup_script.py | 2 +- pyproject.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/glob/manager_core.py b/glob/manager_core.py index 097a723a..4747911a 100644 --- a/glob/manager_core.py +++ b/glob/manager_core.py @@ -23,7 +23,7 @@ import cm_global from manager_util import * -version = [2, 48, 4] +version = [2, 48, 5] version_str = f"V{version[0]}.{version[1]}" + (f'.{version[2]}' if len(version) > 2 else '') @@ -97,7 +97,7 @@ def clear_pip_cache(): def is_blacklisted(name): name = name.strip() - pattern = r'([^<>!=]+)([<>!=]=?)(.*)' + pattern = r'([^<>!=]+)([<>!=]=?)([^ ]*)' match = re.search(pattern, name) if match: @@ -123,7 +123,7 @@ def is_installed(name): if name.startswith('#'): return True - pattern = r'([^<>!=]+)([<>!=]=?)(.*)' + pattern = r'([^<>!=]+)([<>!=]=?)([^ ]*)' match = re.search(pattern, name) if match: diff --git a/prestartup_script.py b/prestartup_script.py index 5aede7e2..3445a318 100644 --- a/prestartup_script.py +++ b/prestartup_script.py @@ -448,7 +448,7 @@ def is_installed(name): if name.startswith('#'): return True - pattern = r'([^<>!=]+)([<>!=]=?)(.*)' + pattern = r'([^<>!=]+)([<>!=]=?)([^ ]*)' match = re.search(pattern, name) if match: diff --git a/pyproject.toml b/pyproject.toml index 1aef3a9c..4820e099 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 = "2.48.4" +version = "2.48.5" license = { file = "LICENSE.txt" } dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]