Replace deprecated pkg_resources usage Change-Id: Ibc1aee3183951c9d88650cbf60c35078c2a86ada
diff --git a/tools/invocation_header_gen.py b/tools/invocation_header_gen.py index 5d3100d..9c1ec03 100755 --- a/tools/invocation_header_gen.py +++ b/tools/invocation_header_gen.py
@@ -9,14 +9,11 @@ # ============================ from __future__ import print_function +from importlib.metadata import version from jinja2 import Environment, BaseLoader import argparse import sys import xml.dom.minidom -import pkg_resources -# We require jinja2 to be at least version 2.10 as we use the 'namespace' feature from -# that version -pkg_resources.require("jinja2>=2.10") COMMON_HEADER = """ @@ -195,6 +192,12 @@ if __name__ == "__main__": + # We require jinja2 to be at least version 2.10 as we used the 'namespace' + # feature from that version. + jinja2_version = version("jinja2") + if jinja2_version < "2.10": + sys.exit("Jinja2 should be >= 2.10") + args = parse_args() invocations = parse_xml(args.xml)
diff --git a/tools/syscall_header_gen.py b/tools/syscall_header_gen.py index 3e7c230..ced8ac5 100755 --- a/tools/syscall_header_gen.py +++ b/tools/syscall_header_gen.py
@@ -9,15 +9,12 @@ # ============================== from __future__ import print_function +from importlib.metadata import version from jinja2 import Environment, BaseLoader import argparse import re import sys import xml.dom.minidom -import pkg_resources -# We require jinja2 to be at least version 2.10 as we use the 'namespace' feature from -# that version -pkg_resources.require("jinja2>=2.10") COMMON_HEADER = """ @@ -223,6 +220,12 @@ if __name__ == "__main__": + # We require jinja2 to be at least version 2.10 as we used the 'namespace' + # feature from that version. + jinja2_version = version("jinja2") + if jinja2_version < "2.10": + sys.exit("Jinja2 should be >= 2.10") + args = parse_args() (api, debug) = parse_xml(args.xml, args.mcs)