FIXED: pip downgrade blacklisting doesn't work if ~= pattern
https://github.com/ltdrdata/ComfyUI-Manager/issues/1301 https://github.com/ltdrdata/ComfyUI-Manager/issues/1425
This commit is contained in:
@@ -41,7 +41,7 @@ import manager_downloader
|
||||
from node_package import InstalledNodePackage
|
||||
|
||||
|
||||
version_code = [3, 6, 3]
|
||||
version_code = [3, 6, 4]
|
||||
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
|
||||
|
||||
|
||||
@@ -277,7 +277,7 @@ def is_installed(name):
|
||||
if match is None:
|
||||
if name in pips:
|
||||
return True
|
||||
elif match.group(2) in ['<=', '==', '<']:
|
||||
elif match.group(2) in ['<=', '==', '<', '~=']:
|
||||
if name in pips:
|
||||
if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
|
||||
print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
|
||||
@@ -723,8 +723,12 @@ class UnifiedManager:
|
||||
return res
|
||||
|
||||
async def get_custom_nodes(self, channel, mode):
|
||||
default_channel = normalize_channel('default')
|
||||
cache = self.custom_node_map_cache.get((default_channel, mode)) # CNR/nightly should always be based on the default channel.
|
||||
# default_channel = normalize_channel('default')
|
||||
# cache = self.custom_node_map_cache.get((default_channel, mode)) # CNR/nightly should always be based on the default channel.
|
||||
|
||||
|
||||
channel = normalize_channel(channel)
|
||||
cache = self.custom_node_map_cache.get((channel, mode)) # CNR/nightly should always be based on the default channel.
|
||||
|
||||
if cache is not None:
|
||||
return cache
|
||||
|
||||
Reference in New Issue
Block a user