core: move Config type (MR 2252)

Keeping the Config class in types seemed kinda weird and was just done
as a workaround to some cyclical imports. But now things are more in
shape let's move it to core.

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>

pmb/__init__.py

@@ -16,7 +16,7 @@ from .helpers import frontend
 from .helpers import logging
 from .helpers import mount
 from .helpers import other
-from .core import Chroot, get_context
+from .core import Chroot, get_context, Config
 from .commands import run_command
 
 # pmbootstrap version

pmb/commands/repo_bootstrap.py

@@ -9,7 +9,7 @@ import glob
 import pmb.config.pmaports
 import pmb.helpers.repo
 import pmb.build
-from pmb.types import Config
+from pmb.core import Config
 from pmb.core import get_context
 
 from pmb import commands

pmb/config/init.py

@@ -14,7 +14,8 @@ from typing import Any, List, Optional
 import pmb.aportgen
 import pmb.config
 import pmb.config.pmaports
-from pmb.types import Config, PmbArgs
+from pmb.core import Config
+from pmb.types import PmbArgs
 import pmb.helpers.cli
 import pmb.helpers.devices
 import pmb.helpers.git

pmb/config/load.py

@@ -7,8 +7,7 @@ import configparser
 import os
 import sys
 import pmb.config
-from pmb.types import Config
+from pmb.core import Config
-from pmb.types import PmbArgs
 
 
 def sanity_check(cfg: Config, key, allowed, path: Optional[Path] = None):

pmb/config/other.py

@@ -1,6 +1,6 @@
 # Copyright 2024 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
-from pmb.types import Config
+from pmb.core import Config
 import pmb.helpers.ui
 import pmb.config.pmaports
 

pmb/core/config.py

@@ -0,0 +1,39 @@
+
+import multiprocessing
+from typing import List, Dict
+from pathlib import Path
+import os
+
+class Config():
+    aports: List[Path] = [Path(os.path.expanduser("~") +
+                        "/.local/var/pmbootstrap/cache_git/pmaports")]
+    boot_size: int = 256
+    build_default_device_arch: bool = False
+    build_pkgs_on_install: bool = True
+    ccache_size: str = "5G" # yeahhhh this one has a suffix
+    device: str = "qemu-amd64"
+    extra_packages: str = "none"
+    extra_space: int = 0
+    hostname: str = ""
+    is_default_channel: bool = True
+    jobs: str = str(multiprocessing.cpu_count() + 1)
+    kernel: str = "stable"
+    keymap: str = ""
+    locale: str = "en_US.UTF-8"
+    # NOTE: mirrors use http by default to leverage caching
+    mirror_alpine: str = "http://dl-cdn.alpinelinux.org/alpine/"
+    # NOTE: mirrors_postmarketos variable type is supposed to be
+    #       comma-separated string, not a python list or any other type!
+    mirrors_postmarketos: List[str] = ["http://mirror.postmarketos.org/postmarketos/"]
+    qemu_redir_stdio: bool = False
+    ssh_key_glob: str = "~/.ssh/id_*.pub"
+    ssh_keys: bool = False
+    sudo_timer: bool = False
+    systemd: str = "default"
+    timezone: str = "GMT"
+    ui: str = "console"
+    ui_extras: bool = False
+    user: str = "user"
+    work: Path = Path(os.path.expanduser("~") + "/.local/var/pmbootstrap")
+
+    providers: Dict[str, str] = { }

pmb/helpers/frontend.py

@@ -16,7 +16,8 @@ import pmb.chroot.initfs
 import pmb.chroot.other
 import pmb.ci
 import pmb.config
-from pmb.types import Config, PathString, PmbArgs
+from pmb.core import Config
+from pmb.types import PmbArgs
 import pmb.export
 import pmb.flasher
 import pmb.helpers.aportupgrade

pmb/helpers/status.py

@@ -3,7 +3,8 @@
 import pmb.config
 import pmb.config.workdir
 import pmb.helpers.git
-from pmb.types import Config, PmbArgs
+from pmb.core import Config
+from pmb.types import PmbArgs
 from pmb.core import get_context
 from typing import List, Tuple
 

pmb/install/_install.py

@@ -17,7 +17,8 @@ import pmb.chroot.initfs
 import pmb.config
 import pmb.config.pmaports
 from pmb.parse.deviceinfo import Deviceinfo
-from pmb.types import Config, PartitionLayout, PmbArgs
+from pmb.core import Config
+from pmb.types import PartitionLayout, PmbArgs
 import pmb.helpers.devices
 from pmb.helpers.mount import mount_device_rootfs
 import pmb.helpers.run

pmb/install/ui.py

@@ -3,7 +3,7 @@
 from typing import List
 from pmb.helpers import logging
 
-from pmb.types import Config
+from pmb.core import Config
 import pmb.helpers.pmaports
 
 

pmb/parse/arguments.py

@@ -6,7 +6,9 @@ import os
 from pathlib import Path
 import sys
 
-from pmb.types import Config, PmbArgs
+from pmb.core.arch import Arch
+from pmb.core import Config
+from pmb.types import PmbArgs
 
 try:
     import argcomplete # type:ignore[import-untyped]

pmb/types.py

@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from argparse import Namespace
-import multiprocessing
-import os
 from pathlib import Path
 from typing import Dict, List, Optional, Tuple, TypedDict, Union
 
@@ -154,38 +152,3 @@ class PmbArgs(Namespace):
     xauth: str
     zap: str
 
-
-class Config():
-    aports: List[Path] = [Path(os.path.expanduser("~") +
-                        "/.local/var/pmbootstrap/cache_git/pmaports")]
-    boot_size: int = 256
-    build_default_device_arch: bool = False
-    build_pkgs_on_install: bool = True
-    ccache_size: str = "5G" # yeahhhh this one has a suffix
-    device: str = "qemu-amd64"
-    extra_packages: str = "none"
-    extra_space: int = 0
-    hostname: str = ""
-    is_default_channel: bool = True
-    jobs: str = str(multiprocessing.cpu_count() + 1)
-    kernel: str = "stable"
-    keymap: str = ""
-    locale: str = "en_US.UTF-8"
-    # NOTE: mirrors use http by default to leverage caching
-    mirror_alpine: str = "http://dl-cdn.alpinelinux.org/alpine/"
-    # NOTE: mirrors_postmarketos variable type is supposed to be
-    #       comma-separated string, not a python list or any other type!
-    mirrors_postmarketos: List[str] = ["http://mirror.postmarketos.org/postmarketos/"]
-    qemu_redir_stdio: bool = False
-    ssh_key_glob: str = "~/.ssh/id_*.pub"
-    ssh_keys: bool = False
-    sudo_timer: bool = False
-    systemd: str = "default"
-    timezone: str = "GMT"
-    ui: str = "console"
-    ui_extras: bool = False
-    user: str = "user"
-    work: Path = Path(os.path.expanduser("~") + "/.local/var/pmbootstrap")
-
-    providers: Dict[str, str] = { }
-