config: move code from __init__.py into cli.py

boot.py

@@ -4,7 +4,7 @@ import click
 
 from typing import Optional
 
-from config import config
+from config.state import config
 from constants import FLASH_PARTS, FASTBOOT, JUMPDRIVE, JUMPDRIVE_VERSION
 from exec.file import makedir
 from fastboot import fastboot_boot, fastboot_erase_dtbo

cache.py

@@ -2,7 +2,7 @@ import click
 import os
 import logging
 
-from config import config
+from config.state import config
 from constants import CHROOT_PATHS
 from exec.file import remove_file
 from packages.cli import cmd_clean as cmd_clean_pkgbuilds

chroot/abstract.py

@@ -7,7 +7,7 @@ from shlex import quote as shell_quote
 from typing import ClassVar, Protocol, Union, Optional, Mapping
 from uuid import uuid4
 
-from config import config
+from config.state import config
 from constants import Arch, CHROOT_PATHS, GCC_HOSTSPECS
 from distro.distro import get_base_distro, get_kupfer_local, RepoInfo
 from exec.cmd import run_root_cmd, generate_env_cmd, flatten_shell_script, wrap_in_bash, generate_cmd_su

chroot/base.py

@@ -8,7 +8,7 @@ from typing import ClassVar
 from constants import Arch
 from exec.cmd import run_root_cmd
 from exec.file import makedir, root_makedir
-from config import config
+from config.state import config
 
 from .abstract import Chroot, get_chroot
 from .helpers import base_chroot_name

chroot/build.py

@@ -4,7 +4,7 @@ import subprocess
 from glob import glob
 from typing import ClassVar, Optional
 
-from config import config
+from config.state import config
 from constants import Arch, GCC_HOSTSPECS, CROSSDIRECT_PKGS, CHROOT_PATHS
 from distro.distro import get_kupfer_local
 from exec.cmd import run_root_cmd

chroot/cli.py

@@ -2,7 +2,7 @@ import click
 import logging
 import os
 
-from config import config
+from config.state import config
 from wrapper import enforce_wrap
 
 from .abstract import Chroot

chroot/device.py

@@ -3,7 +3,7 @@ import os
 
 from typing import ClassVar, Optional
 
-from config import config
+from config.state import config
 from constants import Arch, BASE_PACKAGES
 from distro.repo import RepoInfo
 from distro.distro import get_kupfer_local, get_kupfer_https

chroot/helpers.py

@@ -1,7 +1,7 @@
 import os
 from typing import Optional, TypedDict
 
-from config import config
+from config.state import config
 from constants import Arch
 
 BIND_BUILD_DIRS = 'BINDBUILDDIRS'

config/cli.py

@@ -5,9 +5,12 @@ import os
 from copy import deepcopy
 from typing import Any, Iterable, Optional, Union
 
+from devices.device import get_devices
+from flavours.flavour import get_flavours
+
 from .scheme import Profile
 from .profile import PROFILE_EMPTY, PROFILE_DEFAULTS
-from .state import ConfigStateHolder, CONFIG_DEFAULTS, CONFIG_SECTIONS, merge_configs
+from .state import config, CONFIG_DEFAULTS, CONFIG_SECTIONS, merge_configs
 
 
 def list_to_comma_str(str_list: list[str], default='') -> str:
@@ -129,7 +132,6 @@ def prompt_choice(current: Optional[Any], key: str, choices: Iterable[Any], allo
 
 
 def prompt_profile_device(current: Optional[str], profile_name: str) -> tuple[str, bool]:
-    from devices.device import get_devices
     devices = get_devices()
     print(click.style("Pick your device!\nThese are the available devices:", bold=True))
     for dev in sorted(devices.keys()):
@@ -138,7 +140,6 @@ def prompt_profile_device(current: Optional[str], profile_name: str) -> tuple[st
 
 
 def prompt_profile_flavour(current: Optional[str], profile_name: str) -> tuple[str, bool]:
-    from flavours.flavour import get_flavours
     flavours = get_flavours()
     print(click.style("Pick your flavour!\nThese are the available flavours:", bold=True))
     for f in sorted(flavours.keys()):
@@ -183,8 +184,6 @@ def prompt_for_save(retry_ctx: Optional[click.Context] = None):
     return False
 
 
-config: ConfigStateHolder = ConfigStateHolder(file_conf_base=CONFIG_DEFAULTS)
-
 config_option = click.option(
     '-C',
     '--config',

config/state.py

@@ -315,3 +315,6 @@ class ConfigStateHolder:
             new = {key: val for key, val in new.items() if val is not None}
         self.file.profiles[name] = new
         self.invalidate_profile_cache()
+
+
+config: ConfigStateHolder = ConfigStateHolder(file_conf_base=CONFIG_DEFAULTS)

devices/device.py

@@ -3,7 +3,7 @@ import os
 
 from typing import Optional
 
-from config import config
+from config.state import config
 from constants import Arch, ARCHES
 from config.scheme import DataClass, munchclass
 from distro.distro import get_kupfer_local

devices/deviceinfo.py

@@ -7,7 +7,7 @@ import os
 
 from typing import Mapping
 
-from config import config
+from config.state import config
 from constants import Arch
 from dataclass import DataClass
 

devices/test_device.py

@@ -4,7 +4,7 @@ import os
 
 from copy import copy
 
-from config import ConfigStateHolder, config
+from config.state import ConfigStateHolder, config
 from packages.pkgbuild import init_pkgbuilds, discover_pkgbuilds, Pkgbuild, parse_pkgbuild
 from .device import Device, DEVICE_DEPRECATIONS, get_device, get_devices, parse_device_pkg, check_devicepkg_name
 

devices/test_deviceinfo.py

@@ -1,4 +1,4 @@
-from config import config
+from config.state import config
 
 from .deviceinfo import DeviceInfo, parse_deviceinfo
 from .device import get_device

distro/distro.py

@@ -2,7 +2,7 @@ from typing import Generic, Mapping, Optional, TypeVar
 
 from constants import Arch, ARCHES, BASE_DISTROS, REPOSITORIES, KUPFER_HTTPS, CHROOT_PATHS
 from generator import generate_pacman_conf_body
-from config import config
+from config.state import config
 
 from .repo import BinaryPackageType, RepoInfo, Repo, LocalRepo, RemoteRepo
 

flavours/flavour.py

@@ -7,7 +7,7 @@ import os
 from dataclasses import dataclass
 from typing import Optional
 
-from config import config
+from config.state import config
 from constants import FLAVOUR_DESCRIPTION_PREFIX, FLAVOUR_INFO_FILE
 from packages.pkgbuild import discover_pkgbuilds, get_pkgbuild_by_name, init_pkgbuilds, Pkgbuild
 

generator.py

@@ -1,5 +1,5 @@
 from constants import Arch, CFLAGS_ARCHES, CFLAGS_GENERAL, COMPILE_ARCHES, GCC_HOSTSPECS
-from config import config
+from config.state import config
 
 
 def generate_makepkg_conf(arch: Arch, cross: bool = False, chroot: str = None) -> str:

image.py

@@ -11,7 +11,7 @@ from typing import Optional, Union
 
 from chroot.device import DeviceChroot, get_device_chroot
 from constants import Arch, BASE_LOCAL_PACKAGES, BASE_PACKAGES, POST_CMDS
-from config import config, Profile
+from config.state import config, Profile
 from distro.distro import get_base_distro, get_kupfer_https
 from exec.cmd import run_root_cmd, generate_cmd_su
 from exec.file import root_write_file, root_makedir, makedir

integration_tests.py

@@ -4,7 +4,7 @@ import pytest
 
 from glob import glob
 
-from config import config, CONFIG_DEFAULTS
+from config.state import config, CONFIG_DEFAULTS
 from constants import SRCINFO_METADATA_FILE
 from exec.file import get_temp_dir
 from logger import setup_logging

main.py

@@ -8,7 +8,7 @@ from typing import Optional
 
 from logger import logging, setup_logging, verbose_option
 from wrapper import nowrapper_option, enforce_wrap
-from config import config, config_option, cmd_config
+from config.cli import config, config_option, cmd_config
 from forwarding import cmd_forwarding
 from packages.cli import cmd_packages
 from flavours.cli import cmd_flavours

packages/build.py

@@ -10,7 +10,7 @@ from typing import Iterable, Iterator, Optional
 
 from binfmt import register as binfmt_register
 from constants import REPOSITORIES, CROSSDIRECT_PKGS, QEMU_BINFMT_PKGS, GCC_HOSTSPECS, ARCHES, Arch, CHROOT_PATHS, MAKEPKG_CMD
-from config import config
+from config.state import config
 from exec.cmd import run_cmd, run_root_cmd
 from exec.file import makedir, remove_file, symlink
 from chroot.build import get_build_chroot, BuildChroot

packages/cli.py

@@ -5,7 +5,7 @@ import os
 from glob import glob
 from typing import Iterable, Optional
 
-from config import config
+from config.state import config
 from constants import Arch, ARCHES, REPOSITORIES, SRCINFO_FILE, SRCINFO_METADATA_FILE
 from exec.file import remove_file
 from devices.device import get_profile_device

packages/pkgbuild.py

@@ -8,7 +8,7 @@ import os
 from joblib import Parallel, delayed
 from typing import Iterable, Optional, TypeAlias
 
-from config import config, ConfigStateHolder
+from config.state import config, ConfigStateHolder
 from constants import REPOSITORIES
 from constants import Arch
 from distro.package import PackageInfo

packages/srcinfo_cache.py

@@ -7,7 +7,7 @@ import subprocess
 
 from typing import Optional
 
-from config import config
+from config.state import config
 from constants import MAKEPKG_CMD, SRCINFO_FILE, SRCINFO_METADATA_FILE
 from dataclass import DataClass
 from exec.cmd import run_cmd

ssh.py

@@ -4,7 +4,7 @@ import os
 import pathlib
 import click
 
-from config import config
+from config.state import config
 from constants import SSH_COMMON_OPTIONS, SSH_DEFAULT_HOST, SSH_DEFAULT_PORT
 from exec.cmd import run_cmd
 from wrapper import check_programs_wrap

wrapper/__init__.py

@@ -3,7 +3,7 @@ import logging
 
 from typing import Sequence, Union
 
-from config import config
+from config.state import config
 from constants import Arch
 from utils import programs_available
 from .docker import DockerWrapper

wrapper/docker.py

@@ -4,7 +4,7 @@ import pathlib
 import subprocess
 import sys
 
-from config import config
+from config.state import config
 from exec.file import makedir
 
 from .wrapper import BaseWrapper, WRAPPER_PATHS

wrapper/wrapper.py

@@ -5,7 +5,7 @@ import pathlib
 
 from typing import Protocol
 
-from config import config
+from config.state import config
 from config.state import dump_file as dump_config_file
 from constants import CHROOT_PATHS, WRAPPER_ENV_VAR