Skip to content

Commit 8d042c4

Browse files
authored
Merge pull request #9464 from NoahGorny/fix-pip-debug-parse-version
commands: debug: Use packaging.version.parse to compare
2 parents b944419 + c09bc14 commit 8d042c4

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

news/9461.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
commands: debug: Use packaging.version.parse to compare between versions.

src/pip/_internal/commands/debug.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import pip._vendor
77
from pip._vendor import pkg_resources
88
from pip._vendor.certifi import where
9+
from pip._vendor.packaging.version import parse as parse_version
910

1011
from pip import __file__ as pip_location
1112
from pip._internal.cli import cmdoptions
@@ -100,7 +101,7 @@ def show_actual_vendor_versions(vendor_txt_versions):
100101
extra_message = ' (Unable to locate actual module version, using'\
101102
' vendor.txt specified version)'
102103
actual_version = expected_version
103-
elif actual_version != expected_version:
104+
elif parse_version(actual_version) != parse_version(expected_version):
104105
extra_message = ' (CONFLICT: vendor.txt suggests version should'\
105106
' be {})'.format(expected_version)
106107
logger.info('%s==%s%s', module_name, actual_version, extra_message)

0 commit comments

Comments
 (0)