diff options
| -rw-r--r-- | mesonbuild/dependencies/mpi.py | 4 | ||||
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/gnome.py | 2 | ||||
| -rw-r--r-- | mesonbuild/mparser.py | 2 | ||||
| -rw-r--r-- | mesonbuild/utils/universal.py | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/dependencies/mpi.py b/mesonbuild/dependencies/mpi.py index 842535d..ddb512a 100644 --- a/mesonbuild/dependencies/mpi.py +++ b/mesonbuild/dependencies/mpi.py @@ -102,7 +102,7 @@ def mpi_factory(env: 'Environment', class _MPIConfigToolDependency(ConfigToolDependency): - def _filter_compile_args(self, args: T.Sequence[str]) -> T.List[str]: + def _filter_compile_args(self, args: T.List[str]) -> T.List[str]: """ MPI wrappers return a bunch of garbage args. Drop -O2 and everything that is not needed. @@ -126,7 +126,7 @@ class _MPIConfigToolDependency(ConfigToolDependency): result.append(f) return result - def _filter_link_args(self, args: T.Sequence[str]) -> T.List[str]: + def _filter_link_args(self, args: T.List[str]) -> T.List[str]: """ MPI wrappers return a bunch of garbage args. Drop -O2 and everything that is not needed. diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 59cb6e0..44b2e72 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1377,7 +1377,7 @@ class Interpreter(InterpreterBase, HoldableObject): def func_exception(self, node, args, kwargs): raise Exception() - def add_languages(self, args: T.Sequence[str], required: bool, for_machine: MachineChoice) -> bool: + def add_languages(self, args: T.List[str], required: bool, for_machine: MachineChoice) -> bool: success = self.add_languages_for(args, required, for_machine) if not self.coredata.is_cross_build(): self.coredata.copy_build_options_from_regular_ones() diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index d0d7dbf..d447f09 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -1066,7 +1066,7 @@ class GnomeModule(ExtensionModule): return typelib_includes, new_depends @staticmethod - def _get_external_args_for_langs(state: 'ModuleState', langs: T.Sequence[str]) -> T.List[str]: + def _get_external_args_for_langs(state: 'ModuleState', langs: T.List[str]) -> T.List[str]: ret: T.List[str] = [] for lang in langs: ret += mesonlib.listify(state.environment.coredata.get_external_args(MachineChoice.HOST, lang)) diff --git a/mesonbuild/mparser.py b/mesonbuild/mparser.py index 36590ce..53a4a89 100644 --- a/mesonbuild/mparser.py +++ b/mesonbuild/mparser.py @@ -525,7 +525,7 @@ class Parser: return True return False - def accept_any(self, tids: T.Sequence[str]) -> str: + def accept_any(self, tids: T.Tuple[str, ...]) -> str: tid = self.current.tid if tid in tids: self.getsym() diff --git a/mesonbuild/utils/universal.py b/mesonbuild/utils/universal.py index 68ea0b7..220a7f4 100644 --- a/mesonbuild/utils/universal.py +++ b/mesonbuild/utils/universal.py @@ -1906,7 +1906,7 @@ class RealPathAction(argparse.Action): setattr(namespace, self.dest, os.path.abspath(os.path.realpath(values))) -def get_wine_shortpath(winecmd: T.List[str], wine_paths: T.Sequence[str], +def get_wine_shortpath(winecmd: T.List[str], wine_paths: T.List[str], workdir: T.Optional[str] = None) -> str: ''' WINEPATH size is limited to 1024 bytes which can easily be exceeded when |