diff options
author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-07 20:56:27 +0200 |
---|---|---|
committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-09 09:46:37 +0200 |
commit | 2263a84d0796ffe93c3dc33502dc13412fbd4afe (patch) | |
tree | 6bb428477e7a0d25cffb96fddbc53f3ce94d7513 /mesonbuild/dependencies/misc.py | |
parent | a8cd45d3ab2c84f15b7f4bdc3fee3dbac4eaa3ba (diff) | |
download | meson-2263a84d0796ffe93c3dc33502dc13412fbd4afe.zip meson-2263a84d0796ffe93c3dc33502dc13412fbd4afe.tar.gz meson-2263a84d0796ffe93c3dc33502dc13412fbd4afe.tar.bz2 |
typing: Rename some variables
Diffstat (limited to 'mesonbuild/dependencies/misc.py')
-rw-r--r-- | mesonbuild/dependencies/misc.py | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 9bc279e..79afb41 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -33,17 +33,19 @@ from .factory import DependencyFactory, factory_methods if T.TYPE_CHECKING: from ..environment import Environment, MachineChoice - from .factory import TV_DepGenerators + from .factory import DependencyGenerator @factory_methods({DependencyMethods.PKGCONFIG, DependencyMethods.CMAKE}) -def netcdf_factory(env: 'Environment', for_machine: 'MachineChoice', - kwargs: T.Dict[str, T.Any], methods: T.List[DependencyMethods]) -> 'TV_DepGenerators': +def netcdf_factory(env: 'Environment', + for_machine: 'MachineChoice', + kwargs: T.Dict[str, T.Any], + methods: T.List[DependencyMethods]) -> T.List['DependencyGenerator']: language = kwargs.get('language', 'c') if language not in ('c', 'cpp', 'fortran'): raise DependencyException(f'Language {language} is not supported with NetCDF.') - candidates: 'TV_DepGenerators' = [] + candidates: T.List['DependencyGenerator'] = [] if DependencyMethods.PKGCONFIG in methods: if language == 'fortran': @@ -488,9 +490,11 @@ class CursesSystemDependency(ExternalDependency): @factory_methods({DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL, DependencyMethods.SYSTEM}) -def curses_factory(env: 'Environment', for_machine: 'MachineChoice', - kwargs: T.Dict[str, T.Any], methods: T.List[DependencyMethods]) -> 'TV_DepGenerators': - candidates: 'TV_DepGenerators' = [] +def curses_factory(env: 'Environment', + for_machine: 'MachineChoice', + kwargs: T.Dict[str, T.Any], + methods: T.List[DependencyMethods]) -> T.List['DependencyGenerator']: + candidates: T.List['DependencyGenerator'] = [] if DependencyMethods.PKGCONFIG in methods: pkgconfig_files = ['pdcurses', 'ncursesw', 'ncurses', 'curses'] @@ -511,15 +515,17 @@ def curses_factory(env: 'Environment', for_machine: 'MachineChoice', @factory_methods({DependencyMethods.PKGCONFIG, DependencyMethods.SYSTEM}) -def shaderc_factory(env: 'Environment', for_machine: 'MachineChoice', - kwargs: T.Dict[str, T.Any], methods: T.List[DependencyMethods]) -> 'TV_DepGenerators': +def shaderc_factory(env: 'Environment', + for_machine: 'MachineChoice', + kwargs: T.Dict[str, T.Any], + methods: T.List[DependencyMethods]) -> T.List['DependencyGenerator']: """Custom DependencyFactory for ShaderC. ShaderC's odd you get three different libraries from the same build thing are just easier to represent as a separate function than twisting DependencyFactory even more. """ - candidates: 'TV_DepGenerators' = [] + candidates: T.List['DependencyGenerator'] = [] if DependencyMethods.PKGCONFIG in methods: # ShaderC packages their shared and static libs together |