From b1ddfabf8fbb0561a584bd7cfe2bb712b4105da2 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 17 Jan 2023 18:19:59 -0500 Subject: dependencies: defer importing a custom dependency until it is used This lessens the amount of code imported at Meson startup by mapping each dependency to a dictionary entry and using a programmable import to dynamically return it. Minus 16 files and 6399 lines of code imported at startup. --- run_tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'run_tests.py') diff --git a/run_tests.py b/run_tests.py index 41c9577..66341e4 100755 --- a/run_tests.py +++ b/run_tests.py @@ -36,7 +36,7 @@ import typing as T from mesonbuild.compilers.c import CCompiler from mesonbuild.compilers.detect import detect_c_compiler -from mesonbuild import dependencies +from mesonbuild.dependencies.pkgconfig import PkgConfigDependency from mesonbuild import mesonlib from mesonbuild import mesonmain from mesonbuild import mtest @@ -302,8 +302,8 @@ def run_mtest_inprocess(commandlist: T.List[str]) -> T.Tuple[int, str, str]: def clear_meson_configure_class_caches() -> None: CCompiler.find_library_cache = {} CCompiler.find_framework_cache = {} - dependencies.PkgConfigDependency.pkgbin_cache = {} - dependencies.PkgConfigDependency.class_pkgbin = mesonlib.PerMachine(None, None) + PkgConfigDependency.pkgbin_cache = {} + PkgConfigDependency.class_pkgbin = mesonlib.PerMachine(None, None) mesonlib.project_meson_versions = collections.defaultdict(str) def run_configure_inprocess(commandlist: T.List[str], env: T.Optional[T.Dict[str, str]] = None, catch_exception: bool = False) -> T.Tuple[int, str, str]: -- cgit v1.1