diff options
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 3 | ||||
| -rw-r--r-- | mesonbuild/interpreter/type_checking.py | 1 | ||||
| -rw-r--r-- | mesonbuild/modules/python.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index f22dd683a..e2b399693 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1787,10 +1787,9 @@ class Interpreter(InterpreterBase, HoldableObject): search_dirs=search_dirs) # When adding kwargs, please check if they make sense in dependencies.get_dep_identifier() - @FeatureNewKwargs('dependency', '0.49.0', ['disabler']) - @disablerIfNotFound @typed_pos_args('dependency', varargs=str, min_varargs=1) @typed_kwargs('dependency', *DEPENDENCY_KWS) + @disablerIfNotFound 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/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index 1ac0eb9ed..2bf356058 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -935,6 +935,7 @@ DEPENDENCY_METHOD_KW = KwargInfo( DEPENDENCY_KWS: T.List[KwargInfo] = [ DEFAULT_OPTIONS.evolve(since='0.38.0'), DEPENDENCY_METHOD_KW, + DISABLER_KW.evolve(since='0.49.0'), INCLUDE_TYPE, NATIVE_KW, REQUIRED_KW, diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index 1fec765a4..99602c05a 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -266,13 +266,13 @@ class PythonInstallation(_ExternalProgramHolder['PythonExternalProgram']): self.interpreter.coredata.deps[for_machine].put(identifier, dep) return dep - @disablerIfNotFound @noPosargs @typed_kwargs( 'python_installation.dependency', *DEPENDENCY_KWS, KwargInfo('embed', bool, default=False, since='0.53.0'), ) + @disablerIfNotFound @InterpreterObject.method('dependency') def dependency_method(self, args: T.List['TYPE_var'], kwargs: FuncDependency) -> 'Dependency': disabled, required, feature = extract_required_kwarg(kwargs, self.subproject) |