Make all imports absolute

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index e4068263e96c8c68ef7bfcec132cd6ceedb7a12e..332574ae5fb226d824e4fd08bd2469e13173f815 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -61,7 +61,7 @@ from typing import (
     cast,
 )
 
-from .backend import (
+from mkosi.backend import (
     ARG_DEBUG,
     Distribution,
     ManifestFormat,
@@ -102,7 +102,7 @@ from .backend import (
     tmp_dir,
     warn,
 )
-from .install import (
+from mkosi.install import (
     add_dropin_config,
     add_dropin_config_from_resource,
     copy_file,
@@ -111,9 +111,9 @@ from .install import (
     install_skeleton_trees,
     open_close,
 )
-from .manifest import Manifest
-from .mounts import mount, mount_api_vfs, mount_bind, mount_overlay, mount_tmpfs
-from .syscall import blkpg_add_partition, blkpg_del_partition
+from mkosi.manifest import Manifest
+from mkosi.mounts import mount, mount_api_vfs, mount_bind, mount_overlay, mount_tmpfs
+from mkosi.syscall import blkpg_add_partition, blkpg_del_partition
 
 complete_step = MkosiPrinter.complete_step
 color_error = MkosiPrinter.color_error

diff --git a/mkosi/__main__.py b/mkosi/__main__.py
index 8c84cc63e92b5783bbfc267b0b9bda7d94deee48..d67f9f67e63348081cfc47ee782ecb78bbe43482 100644 (file)
--- a/mkosi/__main__.py
+++ b/mkosi/__main__.py
@@ -7,8 +7,8 @@ import sys
 from subprocess import CalledProcessError
 from typing import Iterator
 
-from . import complete_step, parse_args, run_verb
-from .backend import MkosiException, die
+from mkosi import complete_step, parse_args, run_verb
+from mkosi.backend import MkosiException, die
 
 
 @contextlib.contextmanager

diff --git a/mkosi/backend.py b/mkosi/backend.py
index 755607305d26925b74bfa138ae666493e98c1c4c..21cc927709253d2e86ac1098c79215a7f5011d09 100644 (file)
--- a/mkosi/backend.py
+++ b/mkosi/backend.py
@@ -44,8 +44,8 @@ from typing import (
     cast,
 )
 
-from .distributions import DistributionInstaller
-from .syscall import (
+from mkosi.distributions import DistributionInstaller
+from mkosi.syscall import (
     blkpg_add_partition,
     blkpg_del_partition,
     block_reread_partition_table,

diff --git a/mkosi/distributions/__init__.py b/mkosi/distributions/__init__.py
index 65705dd7cc961fda67523a030c8f10ebf7110f4f..32e57d21ade63550d7dbf2dd9b4c93b072db7130 100644 (file)
--- a/mkosi/distributions/__init__.py
+++ b/mkosi/distributions/__init__.py
@@ -4,7 +4,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING, List
 
 if TYPE_CHECKING:
-    from ..backend import MkosiState
+    from mkosi.backend import MkosiState
 
 
 class DistributionInstaller:

diff --git a/mkosi/distributions/arch.py b/mkosi/distributions/arch.py
index 12119081a733a9fa0bf85375ddbdd72cc7d0b815..19cee157003fdbdb2da97e652a3798a15a91080f 100644 (file)
--- a/mkosi/distributions/arch.py
+++ b/mkosi/distributions/arch.py
@@ -4,7 +4,7 @@ import os
 from textwrap import dedent
 from typing import List, Set
 
-from ..backend import (
+from mkosi.backend import (
     MkosiPrinter,
     MkosiState,
     OutputFormat,
@@ -14,8 +14,8 @@ from ..backend import (
     run,
     sort_packages,
 )
-from ..mounts import mount_api_vfs
-from . import DistributionInstaller
+from mkosi.distributions import DistributionInstaller
+from mkosi.mounts import mount_api_vfs
 
 
 class ArchInstaller(DistributionInstaller):

diff --git a/mkosi/distributions/debian.py b/mkosi/distributions/debian.py
index a3bdf21d317d7e1e8f40ac1dc2d6aafb2adda6c1..c7ea105b4c433feda0631cb18729bd380e0c1b20 100644 (file)
--- a/mkosi/distributions/debian.py
+++ b/mkosi/distributions/debian.py
@@ -7,7 +7,7 @@ from pathlib import Path
 from textwrap import dedent
 from typing import TYPE_CHECKING, Any, Iterable, Iterator, List, Set
 
-from ..backend import (
+from mkosi.backend import (
     MkosiState,
     OutputFormat,
     PartitionIdentifier,
@@ -18,9 +18,9 @@ from ..backend import (
     run,
     run_workspace_command,
 )
-from ..install import install_skeleton_trees, write_resource
-from ..mounts import mount_api_vfs, mount_bind
-from . import DistributionInstaller
+from mkosi.distributions import DistributionInstaller
+from mkosi.install import install_skeleton_trees, write_resource
+from mkosi.mounts import mount_api_vfs, mount_bind
 
 if TYPE_CHECKING:
     CompletedProcess = subprocess.CompletedProcess[Any]

diff --git a/mkosi/distributions/ubuntu.py b/mkosi/distributions/ubuntu.py
index 9429274bcbfc1aa767fc51072b18961badc1b702..26080d0bcee90a2295a7d1bfcf6d552f0315806c 100644 (file)
--- a/mkosi/distributions/ubuntu.py
+++ b/mkosi/distributions/ubuntu.py
@@ -2,8 +2,8 @@
 
 from typing import Set
 
-from ..backend import MkosiState, add_packages
-from .debian import DebianInstaller
+from mkosi.backend import MkosiState, add_packages
+from mkosi.distributions.debian import DebianInstaller
 
 
 class UbuntuInstaller(DebianInstaller):

diff --git a/mkosi/gentoo.py b/mkosi/gentoo.py
index 5b5864db8f2e8c485d4112469240598144963001..8b8cf90a0b3caf212fbdfabced2e6e94389c9957 100644 (file)
--- a/mkosi/gentoo.py
+++ b/mkosi/gentoo.py
@@ -11,8 +11,8 @@ from pathlib import Path
 from textwrap import dedent
 from typing import Dict, Generator, List, Sequence
 
-from . import unlink_try_hard
-from .backend import (
+from mkosi import unlink_try_hard
+from mkosi.backend import (
     ARG_DEBUG,
     MkosiConfig,
     MkosiException,
@@ -25,7 +25,7 @@ from .backend import (
     run_workspace_command,
     safe_tar_extract,
 )
-from .install import copy_path, open_close
+from mkosi.install import copy_path, open_close
 
 ARCHITECTURES = {
     "x86_64": ("amd64", "arch/x86/boot/bzImage"),

diff --git a/mkosi/install.py b/mkosi/install.py
index 6790cfbdda22ee176315a205e7e6325dea129ef5..e6cdee6b11d60d2acf14ae9bb3da434fed6d5203 100644 (file)
--- a/mkosi/install.py
+++ b/mkosi/install.py
@@ -10,8 +10,8 @@ from pathlib import Path
 from textwrap import dedent
 from typing import Any, BinaryIO, Iterator, Optional, cast
 
-from .backend import MkosiState, PathString, complete_step
-from .syscall import reflink
+from mkosi.backend import MkosiState, PathString, complete_step
+from mkosi.syscall import reflink
 
 
 def make_executable(path: Path) -> None:

diff --git a/mkosi/machine.py b/mkosi/machine.py
index 57b37513d2bfeef3cea87cbae4c301273035f540..b02e2801be1b10b8ca5d48e89165c4ec7700d9d3 100644 (file)
--- a/mkosi/machine.py
+++ b/mkosi/machine.py
@@ -14,7 +14,7 @@ from typing import Any, Iterator, Optional, Sequence, TextIO, Union
 
 import pexpect  # type: ignore
 
-from . import (
+from mkosi import (
     MKOSI_COMMANDS_NEED_BUILD,
     CompletedProcess,
     build_stuff,
@@ -34,7 +34,14 @@ from . import (
     run_systemd_cmdline,
     unlink_output,
 )
-from .backend import MkosiConfig, MkosiNotSupportedException, MkosiState, Verb, die, run
+from mkosi.backend import (
+    MkosiConfig,
+    MkosiNotSupportedException,
+    MkosiState,
+    Verb,
+    die,
+    run,
+)
 
 
 class LogfileAdapter:

diff --git a/mkosi/manifest.py b/mkosi/manifest.py
index c7766259ec520d82030cd7e571434b94b7fa682f..b13c961f4af4699f9647704ed8202795b5af643e 100644 (file)
--- a/mkosi/manifest.py
+++ b/mkosi/manifest.py
@@ -8,7 +8,7 @@ from subprocess import DEVNULL, PIPE
 from textwrap import dedent
 from typing import IO, Any, Dict, List, Optional, Tuple, cast
 
-from .backend import Distribution, ManifestFormat, MkosiConfig, PackageType, run
+from mkosi.backend import Distribution, ManifestFormat, MkosiConfig, PackageType, run
 
 
 @dataclasses.dataclass

diff --git a/mkosi/mounts.py b/mkosi/mounts.py
index 6b2959a183bd52eb3675c75884f3efd9ee65b4e0..9e46831652b4f8e4c851867608c0bb2314187534 100644 (file)
--- a/mkosi/mounts.py
+++ b/mkosi/mounts.py
@@ -7,7 +7,7 @@ import tempfile
 from pathlib import Path
 from typing import ContextManager, Iterator, List, Optional, Sequence, Union, cast
 
-from .backend import complete_step, run, scandir_recursive
+from mkosi.backend import complete_step, run, scandir_recursive
 
 PathString = Union[Path, str]
 

diff --git a/tests/test_config_parser.py b/tests/test_config_parser.py
index 70b4547556447a3464b67964396f76e69de5a6a0..b715f015c0f64493f9c2f6206725044f36460398 100644 (file)
--- a/tests/test_config_parser.py
+++ b/tests/test_config_parser.py
@@ -13,6 +13,7 @@ from typing import Any, Dict, Generator, List, Mapping, Optional
 import pytest
 
 import mkosi
+import mkosi.backend
 from mkosi.backend import MkosiException, OutputFormat, SourceFileTransfer, Verb