From: Daan De Meyer Date: Fri, 21 Apr 2023 19:47:07 +0000 (+0200) Subject: Rename backend.py to util.py X-Git-Tag: v15~207^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39b3281742bd0faa17db2cf8b0fba8bef7fe7031;p=thirdparty%2Fmkosi.git Rename backend.py to util.py backend.py is a horrible name, let's use util.py instead. --- diff --git a/mkosi/__init__.py b/mkosi/__init__.py index d910b5f8f..a5283e3a1 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -25,22 +25,6 @@ from pathlib import Path from textwrap import dedent from typing import Callable, ContextManager, Optional, TextIO, TypeVar, Union, cast -from mkosi.backend import ( - Compression, - Distribution, - ManifestFormat, - MkosiConfig, - MkosiState, - OutputFormat, - Verb, - current_user, - flatten, - format_rlimit, - is_dnf_distribution, - patch_file, - set_umask, - tmp_dir, -) from mkosi.install import add_dropin_config_from_resource, copy_path, flock from mkosi.log import ARG_DEBUG, Style, color_error, complete_step, die, log_step from mkosi.manifest import GenericVersion, Manifest @@ -56,6 +40,22 @@ from mkosi.run import ( spawn, ) from mkosi.types import PathString +from mkosi.util import ( + Compression, + Distribution, + ManifestFormat, + MkosiConfig, + MkosiState, + OutputFormat, + Verb, + current_user, + flatten, + format_rlimit, + is_dnf_distribution, + patch_file, + set_umask, + tmp_dir, +) MKOSI_COMMANDS_NEED_BUILD = (Verb.shell, Verb.boot, Verb.qemu, Verb.serve) MKOSI_COMMANDS_SUDO = (Verb.shell, Verb.boot) diff --git a/mkosi/config.py b/mkosi/config.py index df1389cf5..eba8ae329 100644 --- a/mkosi/config.py +++ b/mkosi/config.py @@ -13,7 +13,9 @@ from collections.abc import Sequence from pathlib import Path from typing import Any, Callable, Optional, Type, Union, cast -from mkosi.backend import ( +from mkosi.log import Style, die +from mkosi.pager import page +from mkosi.util import ( Compression, Distribution, ManifestFormat, @@ -24,8 +26,6 @@ from mkosi.backend import ( detect_distribution, flatten, ) -from mkosi.log import Style, die -from mkosi.pager import page __version__ = "14" diff --git a/mkosi/distributions/__init__.py b/mkosi/distributions/__init__.py index e23062957..ffe1877a4 100644 --- a/mkosi/distributions/__init__.py +++ b/mkosi/distributions/__init__.py @@ -5,7 +5,7 @@ from pathlib import Path from typing import TYPE_CHECKING if TYPE_CHECKING: - from mkosi.backend import MkosiState + from mkosi.util import MkosiState class DistributionInstaller: diff --git a/mkosi/distributions/arch.py b/mkosi/distributions/arch.py index ce9610ab4..5a6ddb56b 100644 --- a/mkosi/distributions/arch.py +++ b/mkosi/distributions/arch.py @@ -3,10 +3,10 @@ from collections.abc import Sequence from textwrap import dedent -from mkosi.backend import MkosiState, sort_packages from mkosi.distributions import DistributionInstaller from mkosi.run import run_with_apivfs from mkosi.types import PathString +from mkosi.util import MkosiState, sort_packages class ArchInstaller(DistributionInstaller): diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py index 61bf509bd..1102532c0 100644 --- a/mkosi/distributions/centos.py +++ b/mkosi/distributions/centos.py @@ -4,11 +4,11 @@ import shutil from collections.abc import Sequence from pathlib import Path -from mkosi.backend import Distribution, MkosiConfig, MkosiState from mkosi.distributions import DistributionInstaller from mkosi.distributions.fedora import Repo, invoke_dnf, setup_dnf from mkosi.log import complete_step, die from mkosi.remove import unlink_try_hard +from mkosi.util import Distribution, MkosiConfig, MkosiState def move_rpm_db(root: Path) -> None: diff --git a/mkosi/distributions/debian.py b/mkosi/distributions/debian.py index f00d3cd70..133ae18ec 100644 --- a/mkosi/distributions/debian.py +++ b/mkosi/distributions/debian.py @@ -6,10 +6,10 @@ from collections.abc import Sequence from pathlib import Path from textwrap import dedent -from mkosi.backend import MkosiState from mkosi.distributions import DistributionInstaller from mkosi.run import run, run_with_apivfs from mkosi.types import CompletedProcess, PathString +from mkosi.util import MkosiState class DebianInstaller(DistributionInstaller): diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py index 949d1b9b1..255b2eed5 100644 --- a/mkosi/distributions/fedora.py +++ b/mkosi/distributions/fedora.py @@ -9,10 +9,10 @@ from pathlib import Path from textwrap import dedent from typing import Any, NamedTuple, Optional -from mkosi.backend import Distribution, MkosiState, detect_distribution, sort_packages from mkosi.distributions import DistributionInstaller from mkosi.remove import unlink_try_hard from mkosi.run import run_with_apivfs +from mkosi.util import Distribution, MkosiState, detect_distribution, sort_packages class FedoraInstaller(DistributionInstaller): diff --git a/mkosi/distributions/gentoo.py b/mkosi/distributions/gentoo.py index 61efb08be..e3261cad6 100644 --- a/mkosi/distributions/gentoo.py +++ b/mkosi/distributions/gentoo.py @@ -10,12 +10,12 @@ from collections.abc import Sequence from pathlib import Path from textwrap import dedent -from mkosi.backend import MkosiState, safe_tar_extract from mkosi.distributions import DistributionInstaller from mkosi.install import copy_path, flock from mkosi.log import ARG_DEBUG, complete_step, die, log_step from mkosi.remove import unlink_try_hard from mkosi.run import run_workspace_command +from mkosi.util import MkosiState, safe_tar_extract ARCHITECTURES = { "x86_64": ("amd64", "arch/x86/boot/bzImage"), diff --git a/mkosi/distributions/mageia.py b/mkosi/distributions/mageia.py index 03712ee03..cc8f13317 100644 --- a/mkosi/distributions/mageia.py +++ b/mkosi/distributions/mageia.py @@ -3,9 +3,9 @@ from collections.abc import Sequence from pathlib import Path -from mkosi.backend import MkosiState from mkosi.distributions import DistributionInstaller from mkosi.distributions.fedora import Repo, invoke_dnf, setup_dnf +from mkosi.util import MkosiState class MageiaInstaller(DistributionInstaller): diff --git a/mkosi/distributions/openmandriva.py b/mkosi/distributions/openmandriva.py index b55054f4b..01e08d4f0 100644 --- a/mkosi/distributions/openmandriva.py +++ b/mkosi/distributions/openmandriva.py @@ -3,9 +3,9 @@ from collections.abc import Sequence from pathlib import Path -from mkosi.backend import MkosiState from mkosi.distributions import DistributionInstaller from mkosi.distributions.fedora import Repo, invoke_dnf, setup_dnf +from mkosi.util import MkosiState class OpenmandrivaInstaller(DistributionInstaller): diff --git a/mkosi/distributions/opensuse.py b/mkosi/distributions/opensuse.py index 33641f56d..96f914963 100644 --- a/mkosi/distributions/opensuse.py +++ b/mkosi/distributions/opensuse.py @@ -4,10 +4,10 @@ from collections.abc import Sequence from pathlib import Path from textwrap import dedent -from mkosi.backend import MkosiState from mkosi.distributions import DistributionInstaller from mkosi.run import run_with_apivfs from mkosi.types import PathString +from mkosi.util import MkosiState class OpensuseInstaller(DistributionInstaller): diff --git a/mkosi/distributions/ubuntu.py b/mkosi/distributions/ubuntu.py index 594cba0d1..a54ef2c12 100644 --- a/mkosi/distributions/ubuntu.py +++ b/mkosi/distributions/ubuntu.py @@ -1,7 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1+ -from mkosi.backend import MkosiState from mkosi.distributions.debian import DebianInstaller +from mkosi.util import MkosiState class UbuntuInstaller(DebianInstaller): diff --git a/mkosi/manifest.py b/mkosi/manifest.py index 7c95e781b..bda72a4d1 100644 --- a/mkosi/manifest.py +++ b/mkosi/manifest.py @@ -9,8 +9,8 @@ from subprocess import DEVNULL, PIPE from textwrap import dedent from typing import IO, Any, Optional -from mkosi.backend import Distribution, ManifestFormat, MkosiConfig, PackageType from mkosi.run import run +from mkosi.util import Distribution, ManifestFormat, MkosiConfig, PackageType @dataclasses.dataclass diff --git a/mkosi/run.py b/mkosi/run.py index d58ea003b..11c464b89 100644 --- a/mkosi/run.py +++ b/mkosi/run.py @@ -14,9 +14,9 @@ from pathlib import Path from types import TracebackType from typing import Any, Callable, Mapping, Optional, Sequence, Type, TypeVar -from mkosi.backend import MkosiState, current_user from mkosi.log import ARG_DEBUG, die from mkosi.types import _FILE, CompletedProcess, PathString, Popen +from mkosi.util import MkosiState, current_user CLONE_NEWNS = 0x00020000 CLONE_NEWUSER = 0x10000000 diff --git a/mkosi/backend.py b/mkosi/util.py similarity index 100% rename from mkosi/backend.py rename to mkosi/util.py diff --git a/tests/test_parse_load_args.py b/tests/test_parse_load_args.py index 3d2f7cfc5..38bd63f9a 100644 --- a/tests/test_parse_load_args.py +++ b/tests/test_parse_load_args.py @@ -10,7 +10,7 @@ from typing import Iterator, List, Optional import pytest import mkosi -from mkosi.backend import Compression, Distribution, MkosiConfig, Verb +from mkosi.util import Compression, Distribution, MkosiConfig, Verb from mkosi.config import MkosiConfigParser diff --git a/tests/test_backend.py b/tests/test_util.py similarity index 98% rename from tests/test_backend.py rename to tests/test_util.py index 70108ed6d..448aa0596 100644 --- a/tests/test_backend.py +++ b/tests/test_util.py @@ -7,7 +7,7 @@ from pathlib import Path import pytest -from mkosi.backend import ( +from mkosi.util import ( Distribution, PackageType, safe_tar_extract,