From 36f116b47f0af316b354e4386141cd1f77854df6 Mon Sep 17 00:00:00 2001 From: Julien Massot Date: Fri, 19 Nov 2021 16:30:43 +0100 Subject: [PATCH] scripts/arch: remove usage of deprecated LooseVersion replace with version.parse from packaging module. prevent this warning message: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives Signed-off-by: Julien Massot --- arch/x86/gen_gdt.py | 4 ++-- arch/x86/gen_idt.py | 4 ++-- arch/x86/gen_mmu.py | 4 ++-- scripts/footprint/size_report | 4 ++-- scripts/gen_handles.py | 4 ++-- scripts/gen_kobject_list.py | 4 ++-- scripts/gen_kobject_placeholders.py | 4 ++-- scripts/process_gperf.py | 8 ++++---- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/x86/gen_gdt.py b/arch/x86/gen_gdt.py index 745c3ccd123..aa857d469bc 100755 --- a/arch/x86/gen_gdt.py +++ b/arch/x86/gen_gdt.py @@ -40,14 +40,14 @@ import sys import struct import os -from distutils.version import LooseVersion +from packaging import version import elftools from elftools.elf.elffile import ELFFile from elftools.elf.sections import SymbolTableSection -if LooseVersion(elftools.__version__) < LooseVersion('0.24'): +if version.parse(elftools.__version__) < version.parse('0.24'): sys.exit("pyelftools is out of date, need version 0.24 or later") diff --git a/arch/x86/gen_idt.py b/arch/x86/gen_idt.py index c2e9e1f1fd7..7e5932d0c1f 100755 --- a/arch/x86/gen_idt.py +++ b/arch/x86/gen_idt.py @@ -33,11 +33,11 @@ import sys import struct import os import elftools -from distutils.version import LooseVersion +from packaging import version from elftools.elf.elffile import ELFFile from elftools.elf.sections import SymbolTableSection -if LooseVersion(elftools.__version__) < LooseVersion('0.24'): +if version.parse(elftools.__version__) < version.parse('0.24'): sys.exit("pyelftools is out of date, need version 0.24 or later") # This will never change, first selector in the GDT after the null selector diff --git a/arch/x86/gen_mmu.py b/arch/x86/gen_mmu.py index 74b46355a4e..36783049fac 100755 --- a/arch/x86/gen_mmu.py +++ b/arch/x86/gen_mmu.py @@ -74,13 +74,13 @@ import struct import re import textwrap -from distutils.version import LooseVersion +from packaging import version import elftools from elftools.elf.elffile import ELFFile from elftools.elf.sections import SymbolTableSection -if LooseVersion(elftools.__version__) < LooseVersion('0.24'): +if version.parse(elftools.__version__) < version.parse('0.24'): sys.exit("pyelftools is out of date, need version 0.24 or later") diff --git a/scripts/footprint/size_report b/scripts/footprint/size_report index 0624a8e9c28..7b4ae7d09da 100755 --- a/scripts/footprint/size_report +++ b/scripts/footprint/size_report @@ -18,7 +18,7 @@ import re from pathlib import Path import json -from distutils.version import LooseVersion +from packaging import version from colorama import init, Fore @@ -34,7 +34,7 @@ from elftools.dwarf.descriptions import ( from elftools.dwarf.locationlists import ( LocationExpr, LocationParser) -if LooseVersion(elftools.__version__) < LooseVersion('0.24'): +if version.parse(elftools.__version__) < version.parse('0.24'): sys.exit("pyelftools is out of date, need version 0.24 or later") diff --git a/scripts/gen_handles.py b/scripts/gen_handles.py index ddd47b4a3ee..a8f35b44330 100755 --- a/scripts/gen_handles.py +++ b/scripts/gen_handles.py @@ -31,7 +31,7 @@ import argparse import os import struct import pickle -from distutils.version import LooseVersion +from packaging import version import elftools from elftools.elf.elffile import ELFFile @@ -43,7 +43,7 @@ sys.path.append(os.path.join(os.path.dirname(__file__), 'dts', 'python-devicetree', 'src')) from devicetree import edtlib # pylint: disable=unused-import -if LooseVersion(elftools.__version__) < LooseVersion('0.24'): +if version.parse(elftools.__version__) < version.parse('0.24'): sys.exit("pyelftools is out of date, need version 0.24 or later") scr = os.path.basename(sys.argv[0]) diff --git a/scripts/gen_kobject_list.py b/scripts/gen_kobject_list.py index b5d1e2c478e..f513ec157f1 100755 --- a/scripts/gen_kobject_list.py +++ b/scripts/gen_kobject_list.py @@ -57,13 +57,13 @@ import math import os import struct import json -from distutils.version import LooseVersion +from packaging import version import elftools from elftools.elf.elffile import ELFFile from elftools.elf.sections import SymbolTableSection -if LooseVersion(elftools.__version__) < LooseVersion('0.24'): +if version.parse(elftools.__version__) < version.parse('0.24'): sys.exit("pyelftools is out of date, need version 0.24 or later") from collections import OrderedDict diff --git a/scripts/gen_kobject_placeholders.py b/scripts/gen_kobject_placeholders.py index bd529bc16cd..e7f61720996 100755 --- a/scripts/gen_kobject_placeholders.py +++ b/scripts/gen_kobject_placeholders.py @@ -17,13 +17,13 @@ the same during later stages of linking. import sys import argparse import os -from distutils.version import LooseVersion +from packaging import version import elftools from elftools.elf.elffile import ELFFile -if LooseVersion(elftools.__version__) < LooseVersion('0.24'): +if version.parse(elftools.__version__) < version.parse('0.24'): sys.exit("pyelftools is out of date, need version 0.24 or later") diff --git a/scripts/process_gperf.py b/scripts/process_gperf.py index 1660888a2ab..c086ea14bd4 100755 --- a/scripts/process_gperf.py +++ b/scripts/process_gperf.py @@ -21,7 +21,7 @@ import sys import argparse import os import re -from distutils.version import LooseVersion +from packaging import version # --- debug stuff --- @@ -90,9 +90,9 @@ def process_line(line, fp): m = re.search("gperf version (.*) [*][/]$", line) if m: - v = LooseVersion(m.groups()[0]) - v_lo = LooseVersion("3.0") - v_hi = LooseVersion("3.1") + v = version.parse(m.groups()[0]) + v_lo = version.parse("3.0") + v_hi = version.parse("3.1") if (v < v_lo or v > v_hi): warn("gperf %s is not tested, versions %s through %s supported" % (v, v_lo, v_hi))