diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/dependencies/__init__.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/dlang.py | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/mesonbuild/dependencies/__init__.py b/mesonbuild/dependencies/__init__.py index 36f4e72..2325d56 100644 --- a/mesonbuild/dependencies/__init__.py +++ b/mesonbuild/dependencies/__init__.py @@ -21,7 +21,6 @@ from .base import ( BuiltinDependency, SystemDependency, get_leaf_external_dependencies) from .cmake import CMakeDependency from .configtool import ConfigToolDependency -from .dub import DubDependency from .framework import ExtraFrameworkDependency from .pkgconfig import PkgConfigDependency from .factory import DependencyFactory @@ -57,7 +56,6 @@ __all__ = [ 'CMakeDependency', 'ConfigToolDependency', - 'DubDependency', 'ExtraFrameworkDependency', 'PkgConfigDependency', diff --git a/mesonbuild/modules/dlang.py b/mesonbuild/modules/dlang.py index b9d4299..6d5359f 100644 --- a/mesonbuild/modules/dlang.py +++ b/mesonbuild/modules/dlang.py @@ -20,8 +20,9 @@ import json import os from . import ExtensionModule, ModuleInfo -from .. import dependencies from .. import mlog +from ..dependencies import Dependency +from ..dependencies.dub import DubDependency from ..interpreterbase import typed_pos_args from ..mesonlib import Popen_safe, MesonException @@ -39,7 +40,7 @@ class DlangModule(ExtensionModule): def _init_dub(self, state): if DlangModule.class_dubbin is None: - self.dubbin = dependencies.DubDependency.class_dubbin + self.dubbin = DubDependency.class_dubbin DlangModule.class_dubbin = self.dubbin else: self.dubbin = DlangModule.class_dubbin @@ -82,7 +83,7 @@ class DlangModule(ExtensionModule): config[key] = {} if isinstance(value, list): for dep in value: - if isinstance(dep, dependencies.Dependency): + if isinstance(dep, Dependency): name = dep.get_name() ret, res = self._call_dubbin(['describe', name]) if ret == 0: @@ -91,7 +92,7 @@ class DlangModule(ExtensionModule): config[key][name] = '' else: config[key][name] = version - elif isinstance(value, dependencies.Dependency): + elif isinstance(value, Dependency): name = value.get_name() ret, res = self._call_dubbin(['describe', name]) if ret == 0: |