Merge branch 'main' into feat/cnr
This commit is contained in:
@@ -31,7 +31,7 @@ import cnr_utils
|
||||
from manager_util import *
|
||||
|
||||
|
||||
version_code = [2, 48, 4]
|
||||
version_code = [2, 48, 5]
|
||||
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
|
||||
|
||||
|
||||
@@ -168,7 +168,7 @@ def clear_pip_cache():
|
||||
def is_blacklisted(name):
|
||||
name = name.strip()
|
||||
|
||||
pattern = r'([^<>!=]+)([<>!=]=?)(.*)'
|
||||
pattern = r'([^<>!=]+)([<>!=]=?)([^ ]*)'
|
||||
match = re.search(pattern, name)
|
||||
|
||||
if match:
|
||||
@@ -194,7 +194,7 @@ def is_installed(name):
|
||||
if name.startswith('#'):
|
||||
return True
|
||||
|
||||
pattern = r'([^<>!=]+)([<>!=]=?)(.*)'
|
||||
pattern = r'([^<>!=]+)([<>!=]=?)([^ ]*)'
|
||||
match = re.search(pattern, name)
|
||||
|
||||
if match:
|
||||
|
||||
Reference in New Issue
Block a user