From deede471de9169c49751771118215956f8f1fe27 Mon Sep 17 00:00:00 2001 From: Douglas Yung Date: Mon, 22 Jul 2024 02:14:45 -0700 Subject: [PATCH] Replace distutils.version with packaging.version since the former was deprecated in python 3.10 and removed in 3.12. --- cross-project-tests/lit.cfg.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cross-project-tests/lit.cfg.py b/cross-project-tests/lit.cfg.py index 774c4eaf4d976..9935fe6a199da 100644 --- a/cross-project-tests/lit.cfg.py +++ b/cross-project-tests/lit.cfg.py @@ -4,9 +4,6 @@ import subprocess import sys -# TODO: LooseVersion is undocumented; use something else. -from distutils.version import LooseVersion - import lit.formats import lit.util @@ -279,7 +276,11 @@ def get_clang_default_dwarf_version_string(triple): gdb_version_string = get_gdb_version_string() if dwarf_version_string and gdb_version_string: if int(dwarf_version_string) >= 5: - if LooseVersion(gdb_version_string) < LooseVersion("10.1"): + try: + from packaging import version + except: + lit_config.fatal("Running gdb tests requires the packaging package") + if version.parse(gdb_version_string) < version.parse("10.1"): # Example for llgdb-tests, which use lldb on darwin but gdb elsewhere: # XFAIL: !system-darwin && gdb-clang-incompatibility config.available_features.add("gdb-clang-incompatibility")