Skip to content

Commit fad874b

Browse files
committed
[lldb] Use packaging module instead of pkg_resources
Use the packaging [1] module for parsing version numbers, instead of pkg_resources which is distributed with setuptools. I recently switched over to using the latter, knowing it was deprecated (in favor of the packaging module) because it comes with Python out of the box. Newer versions of setuptools have removed `pkg_resources` so we have to use packaging. [1] https://pypi.org/project/packaging/
1 parent 949ef57 commit fad874b

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

lldb/packages/Python/lldbsuite/test/decorators.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# System modules
22
from functools import wraps
3-
from pkg_resources import packaging
3+
from packaging.version import parse
44
import ctypes
55
import locale
66
import os
@@ -66,9 +66,7 @@ def fn_neq(x, y):
6666
"<=": fn_leq,
6767
}
6868

69-
return op_lookup[comparison](
70-
packaging.version.parse(actual), packaging.version.parse(expected)
71-
)
69+
return op_lookup[comparison](parse(actual), parse(expected))
7270

7371

7472
def _match_decorator_property(expected, actual):

lldb/packages/Python/lldbsuite/test/lldbplatformutil.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
import subprocess
99
import sys
1010
import os
11-
from urllib.parse import urlparse
12-
from pkg_resources import packaging
11+
from packaging.version import parse
1312

1413
# LLDB modules
1514
import lldb
@@ -309,8 +308,8 @@ def expectedCompilerVersion(compiler_version):
309308
# Assume the compiler version is at or near the top of trunk.
310309
return operator in [">", ">=", "!", "!=", "not"]
311310

312-
version = packaging.version.parse(version_str)
313-
test_compiler_version = packaging.version.parse(test_compiler_version_str)
311+
version = parse(version_str)
312+
test_compiler_version = parse(test_compiler_version_str)
314313

315314
if operator == ">":
316315
return test_compiler_version > version

lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ def check_simulator_ostype(self, sdk, platform_name, arch=platform.machine()):
6161

6262
# Older versions of watchOS (<7.0) only support i386
6363
if platform_name == "watchos":
64-
from pkg_resources import packaging
64+
from packaging.version import parse
6565

66-
if packaging.version.parse(vers) < packaging.version.parse("7.0"):
66+
if parse(vers) < parse("7.0"):
6767
arch = "i386"
6868

6969
triple = "-".join([arch, "apple", platform_name + vers, "simulator"])

lldb/test/Shell/helper/build.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -519,9 +519,9 @@ def _find_windows_sdk_in_registry_view(self, view):
519519

520520
# Windows SDK version numbers consist of 4 dotted components, so we
521521
# have to use LooseVersion, as StrictVersion supports 3 or fewer.
522-
from pkg_resources import packaging
522+
from packaging.version import parse
523523

524-
sdk_versions.sort(key=lambda x: packaging.version.parse(x), reverse=True)
524+
sdk_versions.sort(key=lambda x: parse(x), reverse=True)
525525
option_value_name = "OptionId.DesktopCPP" + self.msvc_arch_str
526526
for v in sdk_versions:
527527
try:

0 commit comments

Comments
 (0)