dependencies: Remove log_tried method

It's now only used to populate the DependencyCandidate, so we can remove
it and just calculate the same information from the `type_name`
parameter. This reduces code and the number of method calls.

Author: dcbaker

mesonbuild/dependencies/base.py

@@ -464,10 +464,6 @@ def log_details(self) -> str:
     def log_info(self) -> str:
         return ''
 
-    @staticmethod
-    def log_tried() -> str:
-        return ''
-
     # Check if dependency version meets the requirements
     def _check_version(self) -> None:
         if not self.is_found:
@@ -673,21 +669,13 @@ class SystemDependency(ExternalDependency):
 
     type_name = DependencyTypeName('system')
 
-    @staticmethod
-    def log_tried() -> str:
-        return 'system'
-
 
 class BuiltinDependency(ExternalDependency):
 
     """Dependency base for Builtin type dependencies."""
 
     type_name = DependencyTypeName('builtin')
 
-    @staticmethod
-    def log_tried() -> str:
-        return 'builtin'
-
 
 @dataclasses.dataclass
 class DependencyCandidate(T.Generic[DepType]):
@@ -711,4 +699,12 @@ def from_dependency(cls, name: str, dep: T.Type[DepType],
                         args: T.Optional[T.Tuple[Environment, DependencyObjectKWs]] = None,
                         modules: T.Optional[T.List[str]] = None,
                         ) -> DependencyCandidate[DepType]:
-        return cls(dep, name, dep.log_tried(), modules, arguments=args)
+        tried = str(dep.type_name)
+
+        # fixup the cases where type_name and log tried don't match
+        if tried in {'extraframeworks', 'appleframeworks'}:
+            tried = 'framework'
+        elif tried == 'pkgconfig':
+            tried = 'pkg-config'
+
+        return cls(dep, name, tried, modules, arguments=args)

mesonbuild/dependencies/cmake.py

@@ -609,10 +609,6 @@ def _call_cmake(self,
         build_dir = self._setup_cmake_dir(cmake_file)
         return self.cmakebin.call(args, build_dir, env=env)
 
-    @staticmethod
-    def log_tried() -> str:
-        return 'cmake'
-
     def log_details(self) -> str:
         modules = [self._original_module_name(x) for x in self.found_modules]
         modules = sorted(set(modules))

mesonbuild/dependencies/configtool.py

@@ -150,10 +150,6 @@ def get_config_value(self, args: T.List[str], stage: str) -> T.List[str]:
     def get_variable_args(self, variable_name: str) -> T.List[str]:
         return [f'--{variable_name}']
 
-    @staticmethod
-    def log_tried() -> str:
-        return 'config-tool'
-
     def get_variable(self, *, cmake: T.Optional[str] = None, pkgconfig: T.Optional[str] = None,
                      configtool: T.Optional[str] = None, internal: T.Optional[str] = None,
                      system: T.Optional[str] = None, default_value: T.Optional[str] = None,

mesonbuild/dependencies/framework.py

@@ -112,7 +112,3 @@ def _get_framework_include_path(self, path: Path) -> T.Optional[str]:
 
     def log_info(self) -> str:
         return self.framework_path or ''
-
-    @staticmethod
-    def log_tried() -> str:
-        return 'framework'

mesonbuild/dependencies/pkgconfig.py

@@ -586,10 +586,6 @@ def extract_libtool_shlib(self, la_file: str) -> T.Optional[str]:
         # a path rather than the raw dlname
         return os.path.basename(dlname)
 
-    @staticmethod
-    def log_tried() -> str:
-        return 'pkgconfig'
-
     def get_variable(self, *, cmake: T.Optional[str] = None, pkgconfig: T.Optional[str] = None,
                      configtool: T.Optional[str] = None, internal: T.Optional[str] = None,
                      system: T.Optional[str] = None, default_value: T.Optional[str] = None,

mesonbuild/dependencies/platform.py

@@ -47,8 +47,4 @@ def __init__(self, name: str, env: 'Environment', kwargs: DependencyObjectKWs) -
     def log_info(self) -> str:
         return ', '.join(self.frameworks)
 
-    @staticmethod
-    def log_tried() -> str:
-        return 'framework'
-
 packages['appleframeworks'] = AppleFrameworks

mesonbuild/dependencies/python.py

@@ -559,10 +559,6 @@ def __init__(self, name: str, environment: 'Environment',
         if not self.clib_compiler.has_header('Python.h', '', environment, extra_args=self.compile_args)[0]:
             self.is_found = False
 
-    @staticmethod
-    def log_tried() -> str:
-        return 'sysconfig'
-
 def python_factory(env: Environment, kwargs: DependencyObjectKWs,
                    installation: T.Optional['BasicPythonExternalProgram'] = None) -> T.List['DependencyGenerator']:
     # We can't use the factory_methods decorator here, as we need to pass the
@@ -579,15 +575,16 @@ def python_factory(env: Environment, kwargs: DependencyObjectKWs,
         if from_installation:
             candidates.append(DependencyCandidate(
                 functools.partial(PythonPkgConfigDependency, installation=installation),
-                'python', PythonPkgConfigDependency.log_tried(), arguments=(env, kwargs)))
+                'python', PythonPkgConfigDependency.type_name, arguments=(env, kwargs)))
         else:
             candidates.append(DependencyCandidate.from_dependency(
                 'python3', PkgConfigDependency, (env, kwargs)))
 
     if DependencyMethods.SYSTEM in methods:
+        # This is a unique log-tried.
         candidates.append(DependencyCandidate(
             functools.partial(PythonSystemDependency, installation=installation),
-            'python', PythonSystemDependency.log_tried(), arguments=(env, kwargs)))
+            'python', 'sysconfig', arguments=(env, kwargs)))
 
     if DependencyMethods.EXTRAFRAMEWORK in methods:
         nkwargs = kwargs.copy()
@@ -597,7 +594,7 @@ def python_factory(env: Environment, kwargs: DependencyObjectKWs,
             nkwargs['paths'] = ['/Library/Frameworks']
         candidates.append(DependencyCandidate(
             functools.partial(PythonFrameworkDependency, installation=installation),
-            'python', PythonFrameworkDependency.log_tried(), arguments=(env, nkwargs)))
+            'python', PythonPkgConfigDependency.type_name, arguments=(env, nkwargs)))
 
     return candidates