From c09bc1432b4bc8ca16cb9f91400ec2260cdffec6 Mon Sep 17 00:00:00 2001 From: Noah Gorny Date: Sat, 16 Jan 2021 17:59:18 +0200 Subject: [PATCH] commands: debug: Use packaging.version.parse to compare --- news/9461.bugfix.rst | 1 + src/pip/_internal/commands/debug.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 news/9461.bugfix.rst diff --git a/news/9461.bugfix.rst b/news/9461.bugfix.rst new file mode 100644 index 000000000..b1decff41 --- /dev/null +++ b/news/9461.bugfix.rst @@ -0,0 +1 @@ +commands: debug: Use packaging.version.parse to compare between versions. diff --git a/src/pip/_internal/commands/debug.py b/src/pip/_internal/commands/debug.py index 61df18e20..be4f47040 100644 --- a/src/pip/_internal/commands/debug.py +++ b/src/pip/_internal/commands/debug.py @@ -6,6 +6,7 @@ import sys import pip._vendor from pip._vendor import pkg_resources from pip._vendor.certifi import where +from pip._vendor.packaging.version import parse as parse_version from pip import __file__ as pip_location from pip._internal.cli import cmdoptions @@ -100,7 +101,7 @@ def show_actual_vendor_versions(vendor_txt_versions): extra_message = ' (Unable to locate actual module version, using'\ ' vendor.txt specified version)' actual_version = expected_version - elif actual_version != expected_version: + elif parse_version(actual_version) != parse_version(expected_version): extra_message = ' (CONFLICT: vendor.txt suggests version should'\ ' be {})'.format(expected_version) logger.info('%s==%s%s', module_name, actual_version, extra_message)