diff options
author | Eli Schwartz <eschwartz@archlinux.org> | 2022-02-10 21:48:19 -0500 |
---|---|---|
committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-02-14 20:40:41 -0500 |
commit | 39f61795ca1ae7de3c4c1fc08f88b3d864502cec (patch) | |
tree | 5c44e69c23a54b476020bfcc4b42dbbaa96f2909 /mesonbuild/dependencies | |
parent | c0b8e02d9fb1b58551b18e68ae188263dd90eb4c (diff) | |
download | meson-39f61795ca1ae7de3c4c1fc08f88b3d864502cec.zip meson-39f61795ca1ae7de3c4c1fc08f88b3d864502cec.tar.gz meson-39f61795ca1ae7de3c4c1fc08f88b3d864502cec.tar.bz2 |
comment out broken Feature checks that fail mypy
We currently cannot make this work because inside dependency() we don't
know the current subproject. We would also like the optional but
extremely useful location node, but we don't have that either...
Convert the broken code to a FIXME for visibility.
Diffstat (limited to 'mesonbuild/dependencies')
-rw-r--r-- | mesonbuild/dependencies/base.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index b79be42..31c6806 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -24,7 +24,7 @@ from .. import mlog from ..compilers import clib_langs from ..mesonlib import LibType, MachineChoice, MesonException, HoldableObject from ..mesonlib import version_compare_many -from ..interpreterbase import FeatureDeprecated +#from ..interpreterbase import FeatureDeprecated, FeatureNew if T.TYPE_CHECKING: from .._typing import ImmutableListProtocol @@ -496,14 +496,21 @@ def process_method_kw(possible: T.Iterable[DependencyMethods], kwargs: T.Dict[st raise DependencyException(f'method {method!r} is invalid') method = DependencyMethods(method) + # Raise FeatureNew where appropriate + if method is DependencyMethods.CONFIG_TOOL: + # FIXME: needs to get a handle on the subproject + # FeatureNew.single_use('Configuration method "config-tool"', '0.44.0') + pass # This sets per-tool config methods which are deprecated to to the new # generic CONFIG_TOOL value. if method in [DependencyMethods.SDLCONFIG, DependencyMethods.CUPSCONFIG, DependencyMethods.PCAPCONFIG, DependencyMethods.LIBWMFCONFIG]: - FeatureDeprecated.single_use(f'Configuration method {method.value}', '0.44', 'Use "config-tool" instead.') + # FIXME: needs to get a handle on the subproject + #FeatureDeprecated.single_use(f'Configuration method {method.value}', '0.44', 'Use "config-tool" instead.') method = DependencyMethods.CONFIG_TOOL if method is DependencyMethods.QMAKE: - FeatureDeprecated.single_use('Configuration method "qmake"', '0.58', 'Use "config-tool" instead.') + # FIXME: needs to get a handle on the subproject + # FeatureDeprecated.single_use('Configuration method "qmake"', '0.58', 'Use "config-tool" instead.') method = DependencyMethods.CONFIG_TOOL # Set the detection method. If the method is set to auto, use any available method. |