From 4ad1c8a238250b60a1ed67a39734eeac6ba15de7 Mon Sep 17 00:00:00 2001 From: "Wenyu.Li" Date: Sun, 12 Jan 2025 13:21:59 +0800 Subject: [PATCH] fix pattern (#1439) --- glob/manager_core.py | 6 +++--- prestartup_script.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/glob/manager_core.py b/glob/manager_core.py index 5781d0df..8590a21f 100644 --- a/glob/manager_core.py +++ b/glob/manager_core.py @@ -233,7 +233,7 @@ def remap_pip_package(pkg): def is_blacklisted(name): name = name.strip() - pattern = r'([^<>!=]+)([<>!=]=?)([^ ]*)' + pattern = r'([^<>!~=]+)([<>!~=]=?)([^ ]*)' match = re.search(pattern, name) if match: @@ -248,7 +248,7 @@ def is_blacklisted(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)): return True @@ -262,7 +262,7 @@ def is_installed(name): if name.startswith('#'): return True - pattern = r'([^<>!=]+)([<>!=]=?)([0-9.a-zA-Z]*)' + pattern = r'([^<>!~=]+)([<>!~=]=?)([0-9.a-zA-Z]*)' match = re.search(pattern, name) if match: diff --git a/prestartup_script.py b/prestartup_script.py index 731ff004..2ee76874 100644 --- a/prestartup_script.py +++ b/prestartup_script.py @@ -413,7 +413,7 @@ def is_installed(name): if name.startswith('#'): return True - pattern = r'([^<>!=]+)([<>!=]=?)([0-9.a-zA-Z]*)' + pattern = r'([^<>!~=]+)([<>!~=]=?)([0-9.a-zA-Z]*)' match = re.search(pattern, name) if match: