From b5678137c1174c738f956d12cc8d9d4c11bc579d Mon Sep 17 00:00:00 2001 From: Cindy Liu Date: Thu, 14 Dec 2023 17:55:35 -0800 Subject: [PATCH] Replace deprecated pkg_resources usage Use importlib.metadata to check the jinja2 version Signed-off-by: Cindy Liu --- cdl_utils/capdl_linker.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cdl_utils/capdl_linker.py b/cdl_utils/capdl_linker.py index dd75226d..6bee81c2 100644 --- a/cdl_utils/capdl_linker.py +++ b/cdl_utils/capdl_linker.py @@ -8,6 +8,7 @@ from capdl.Object import register_object_sizes, Untyped from capdl.Allocator import ASIDTableAllocator, BestFitAllocator from capdl import ELF, lookup_architecture, TCB, valid_architectures +from importlib.metadata import version from jinja2 import Environment, BaseLoader, FileSystemLoader import sys import argparse @@ -15,10 +16,8 @@ import logging import os import tempfile -import pkg_resources import yaml import six -pkg_resources.require("jinja2>=2.10") CSPACE_TEMPLATE_FILE = os.path.join(os.path.dirname(__file__), "templates/cspace.template.c") @@ -29,6 +28,10 @@ def manifest(cap_symbols, region_symbols, architecture, targets): Generates a c file from CSPACE_TEMPLATE_FILE with some runtime information about CSpace slots and special address ranges """ + jinja2_version = version("jinja2") + if jinja2_version < "2.10": + raise Warning("Jinja2 should be >= 2.10") + temp_file = open(CSPACE_TEMPLATE_FILE, 'r').read() template = Environment(loader=BaseLoader).from_string(temp_file)