fix: is_installed - consider --index-url pattern

This commit is contained in:
Dr.Lt.Data 2024-08-04 02:03:42 +09:00
parent 6048092d93
commit 35285dd74b
3 changed files with 5 additions and 5 deletions

View File

@ -23,7 +23,7 @@ sys.path.append(glob_path)
import cm_global import cm_global
from manager_util import * 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 '') 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): def is_blacklisted(name):
name = name.strip() name = name.strip()
pattern = r'([^<>!=]+)([<>!=]=?)(.*)' pattern = r'([^<>!=]+)([<>!=]=?)([^ ]*)'
match = re.search(pattern, name) match = re.search(pattern, name)
if match: if match:
@ -123,7 +123,7 @@ def is_installed(name):
if name.startswith('#'): if name.startswith('#'):
return True return True
pattern = r'([^<>!=]+)([<>!=]=?)(.*)' pattern = r'([^<>!=]+)([<>!=]=?)([^ ]*)'
match = re.search(pattern, name) match = re.search(pattern, name)
if match: if match:

View File

@ -448,7 +448,7 @@ def is_installed(name):
if name.startswith('#'): if name.startswith('#'):
return True return True
pattern = r'([^<>!=]+)([<>!=]=?)(.*)' pattern = r'([^<>!=]+)([<>!=]=?)([^ ]*)'
match = re.search(pattern, name) match = re.search(pattern, name)
if match: if match:

View File

@ -1,7 +1,7 @@
[project] [project]
name = "comfyui-manager" 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." 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" } license = { file = "LICENSE.txt" }
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"] dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]