diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-05-31 19:46:09 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-06-03 10:23:27 -0700 |
| commit | 95b70bcb97afa9177645e4926afdf3792fb73eb5 (patch) | |
| tree | dea7c5ec83a7b2a90b533f58d50ad88b8961bc8f /mesonbuild/modules | |
| parent | 201dc6422683858f9656c8b572530237c810feef (diff) | |
| download | meson-95b70bcb97afa9177645e4926afdf3792fb73eb5.zip meson-95b70bcb97afa9177645e4926afdf3792fb73eb5.tar.gz meson-95b70bcb97afa9177645e4926afdf3792fb73eb5.tar.bz2 | |
deps: Split dependencies.base
Split the Factory and dependency classes out
of the base.py script to improve maintainability.
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/dlang.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/python.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/qt.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/unstable_external_project.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/modules/dlang.py b/mesonbuild/modules/dlang.py index f08803d..e2a55b6 100644 --- a/mesonbuild/modules/dlang.py +++ b/mesonbuild/modules/dlang.py @@ -26,7 +26,7 @@ from ..mesonlib import ( Popen_safe, MesonException ) -from ..dependencies.base import DubDependency +from ..dependencies import DubDependency from ..programs import ExternalProgram from ..interpreter import DependencyHolder diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index c2f713c..5cebd28 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -17,7 +17,7 @@ from pathlib import PurePath from .. import build from .. import dependencies -from ..dependencies.misc import ThreadDependency +from ..dependencies import ThreadDependency from .. import mesonlib from .. import mlog from . import ModuleReturnValue diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index b7070df..0e3df9b 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -30,7 +30,7 @@ from ..interpreter import ExternalProgramHolder, extract_required_kwarg, permitt from ..build import known_shmod_kwargs from .. import mlog from ..environment import detect_cpu_family -from ..dependencies.base import ( +from ..dependencies import ( DependencyMethods, ExternalDependency, PkgConfigDependency, NotFoundDependency ) diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index dd69611..aecfe50 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from mesonbuild.dependencies.base import find_external_dependency +from mesonbuild.dependencies import find_external_dependency import os import shutil import typing as T diff --git a/mesonbuild/modules/unstable_external_project.py b/mesonbuild/modules/unstable_external_project.py index cd6cce4..f10c7aa 100644 --- a/mesonbuild/modules/unstable_external_project.py +++ b/mesonbuild/modules/unstable_external_project.py @@ -24,7 +24,7 @@ from ..interpreterbase import InterpreterException, FeatureNew from ..interpreterbase import permittedKwargs, typed_pos_args from ..interpreter import DependencyHolder from ..compilers.compilers import CFLAGS_MAPPING, CEXE_MAPPING -from ..dependencies.base import InternalDependency, PkgConfigDependency +from ..dependencies import InternalDependency, PkgConfigDependency from ..mesonlib import OptionKey class ExternalProject(ModuleObject): |