Skip to content

Commit 3a06a8b

Browse files
dyungyuxuanchen1997
authored andcommitted
Replace distutils.version with packaging.version since the former was deprecated in python 3.10 and removed in 3.12. (#99852)
Attempt to reland #99549, but using packaging.version instead of looseversion, based on the usage used for LLDB in #93712.
1 parent 23edb3f commit 3a06a8b

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

cross-project-tests/lit.cfg.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import subprocess
55
import sys
66

7-
# TODO: LooseVersion is undocumented; use something else.
8-
from distutils.version import LooseVersion
9-
107
import lit.formats
118
import lit.util
129

@@ -279,7 +276,11 @@ def get_clang_default_dwarf_version_string(triple):
279276
gdb_version_string = get_gdb_version_string()
280277
if dwarf_version_string and gdb_version_string:
281278
if int(dwarf_version_string) >= 5:
282-
if LooseVersion(gdb_version_string) < LooseVersion("10.1"):
279+
try:
280+
from packaging import version
281+
except:
282+
lit_config.fatal("Running gdb tests requires the packaging package")
283+
if version.parse(gdb_version_string) < version.parse("10.1"):
283284
# Example for llgdb-tests, which use lldb on darwin but gdb elsewhere:
284285
# XFAIL: !system-darwin && gdb-clang-incompatibility
285286
config.available_features.add("gdb-clang-incompatibility")

0 commit comments

Comments
 (0)