From 6d562d8105ca09fc8e8ea03cd0f4bb5d429e446f Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 6 Dec 2024 14:38:00 -0800 Subject: interpreter: remove permittedKwargs from dependency This is also the ideal time to remove the `allow_unknown` from `typed_kwargs`, as permittedKwargs was providing extra key checking, so now `typed_kwargs` can do that instead. --- mesonbuild/interpreter/interpreter.py | 3 +-- mesonbuild/modules/python.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 118acce53..f22dd683a 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1789,9 +1789,8 @@ class Interpreter(InterpreterBase, HoldableObject): # When adding kwargs, please check if they make sense in dependencies.get_dep_identifier() @FeatureNewKwargs('dependency', '0.49.0', ['disabler']) @disablerIfNotFound - @permittedKwargs(permitted_dependency_kwargs) @typed_pos_args('dependency', varargs=str, min_varargs=1) - @typed_kwargs('dependency', *DEPENDENCY_KWS, allow_unknown=True) + @typed_kwargs('dependency', *DEPENDENCY_KWS) def func_dependency(self, node: mparser.BaseNode, args: T.Tuple[T.List[str]], kwargs: kwtypes.FuncDependency) -> Dependency: # Replace '' by empty list of names names = [n for n in args[0] if n] diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index 55cb24ea5..1fec765a4 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -14,7 +14,7 @@ from ..build import known_shmod_kwargs, CustomTarget, CustomTargetIndex, BuildTa from ..dependencies import NotFoundDependency from ..dependencies.detect import get_dep_identifier, find_external_dependency from ..dependencies.python import BasicPythonExternalProgram, python_factory, _PythonDependencyBase -from ..interpreter import extract_required_kwarg, permitted_dependency_kwargs, primitives as P_OBJ +from ..interpreter import extract_required_kwarg, primitives as P_OBJ from ..interpreter.interpreterobjects import _ExternalProgramHolder from ..interpreter.type_checking import NoneType, DEPENDENCY_KWS, PRESERVE_PATH_KW, SHARED_MOD_KWS from ..interpreterbase import ( @@ -267,7 +267,6 @@ class PythonInstallation(_ExternalProgramHolder['PythonExternalProgram']): return dep @disablerIfNotFound - @permittedKwargs(permitted_dependency_kwargs | {'embed'}) @noPosargs @typed_kwargs( 'python_installation.dependency', -- cgit v1.2.3