wangbo/ComfyUI-Manager
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI-Manager.git synced 2026-07-27 18:47:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix the situation that requiresments.txt contains ~=

Browse Source
This commit is contained in:
sko00o
2024-12-06 01:32:46 +08:00
parent 621ca13906
commit cbc592bc9a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glob/manager_core.py
+4 -4
View File
@@ -131,7 +131,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:
@@ -146,7 +146,7 @@ def is_blacklisted(name):
if match is None: if match is None:
if name in pips: if name in pips:
return True return True
elif match.group(2) in ['<=', '==', '<']: elif match.group(2) in ['<=', '==', '~=', '<']:
if name in pips: if name in pips:
if StrictVersion(pips[name]) >= StrictVersion(match.group(3)): if StrictVersion(pips[name]) >= StrictVersion(match.group(3)):
return True return True
@@ -160,7 +160,7 @@ def is_installed(name):
if name.startswith('#'): if name.startswith('#'):
return True return True
pattern = r'([^<>!=]+)([<>!=]=?)([0-9.a-zA-Z]*)' pattern = r'([^<>!~=]+)([<>!~=]=?)([0-9.a-zA-Z]*)'
match = re.search(pattern, name) match = re.search(pattern, name)
if match: if match:
@@ -175,7 +175,7 @@ def is_installed(name):
if match is None: if match is None:
if name in pips: if name in pips:
return True return True
elif match.group(2) in ['<=', '==', '<']: elif match.group(2) in ['<=', '==', '~=', '<']:
if name in pips: if name in pips:
if StrictVersion(pips[name]) >= StrictVersion(match.group(3)): if StrictVersion(pips[name]) >= StrictVersion(match.group(3)):
print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'") print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
prestartup_script.py
+2 -2
View File
@@ -394,7 +394,7 @@ def is_installed(name):
if name.startswith('#'): if name.startswith('#'):
return True return True
pattern = r'([^<>!=]+)([<>!=]=?)([0-9.a-zA-Z]*)' pattern = r'([^<>!~=]+)([<>!~=]=?)([0-9.a-zA-Z]*)'
match = re.search(pattern, name) match = re.search(pattern, name)
if match: if match:
@@ -409,7 +409,7 @@ def is_installed(name):
if match is None: if match is None:
if name in pips: if name in pips:
return True return True
elif match.group(2) in ['<=', '==', '<']: elif match.group(2) in ['<=', '==', '~=', '<']:
if name in pips: if name in pips:
if StrictVersion(pips[name]) >= StrictVersion(match.group(3)): if StrictVersion(pips[name]) >= StrictVersion(match.group(3)):
print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'") print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")