diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2023-01-17 18:14:43 -0500 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2023-06-26 13:10:32 -0400 |
| commit | 216f7476de668a3af0f7884e014d117cd16a3eb0 (patch) | |
| tree | 21168997ed308990f17e5981d11601db6b65b120 /mesonbuild/modules | |
| parent | e715400d1bb41eae6c0df799beb4b27047f83bff (diff) | |
| download | meson-216f7476de668a3af0f7884e014d117cd16a3eb0.tar.gz | |
dependencies: move dub to a hidden package internal detail
Do not import it and expose it at the package scope, it's never used
elsewhere except inside the dub module.
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/dlang.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mesonbuild/modules/dlang.py b/mesonbuild/modules/dlang.py index b9d4299cf..6d5359fe3 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: |
