You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
34 lines
1.5 KiB
34 lines
1.5 KiB
From a51e8ddfdc246dd3a03edb18712136c38829799f Mon Sep 17 00:00:00 2001 |
|
From: Paolo Bonzini <pbonzini@redhat.com> |
|
Date: Wed, 2 Nov 2022 10:06:40 +0100 |
|
Subject: [PATCH 1/9] accept positional arguments for python.dependency |
|
Content-Type: text/plain |
|
|
|
Partial revert of upstream commit 1f7ab2f0100. |
|
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
|
--- |
|
mesonbuild/modules/python.py | 6 +++++- |
|
1 file changed, 5 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py |
|
index 6728cd401..39967cbae 100644 |
|
--- a/mesonbuild/modules/python.py |
|
+++ b/mesonbuild/modules/python.py |
|
@@ -576,8 +576,12 @@ class PythonInstallation(ExternalProgramHolder): |
|
@disablerIfNotFound |
|
@permittedKwargs(permitted_dependency_kwargs | {'embed'}) |
|
@FeatureNewKwargs('python_installation.dependency', '0.53.0', ['embed']) |
|
- @noPosargs |
|
def dependency_method(self, args: T.List['TYPE_var'], kwargs: 'TYPE_kwargs') -> 'Dependency': |
|
+ if args: |
|
+ mlog.warning('python_installation.dependency() does not take any ' |
|
+ 'positional arguments. It always returns a Python ' |
|
+ 'dependency. This will become an error in the future.', |
|
+ location=self.interpreter.current_node) |
|
disabled, required, feature = extract_required_kwarg(kwargs, self.subproject) |
|
if disabled: |
|
mlog.log('Dependency', mlog.bold('python'), 'skipped: feature', mlog.bold(feature), 'disabled') |
|
-- |
|
2.38.1 |
|
|
|
|