move kbs libary files to src/

format.sh

@@ -6,7 +6,7 @@ autoflake_args=('--recursive' '--remove-unused-variables' '--remove-all-unused-i
 format() {
     files=("$@")
     if [[ -z "${files[*]}" ]]; then
-        files=(".")
+        files=(*.py "src")
     fi
 
     yapf "${yapf_args[@]}"  "${files[@]}"

integration_tests.py

@@ -5,13 +5,13 @@ import pytest
 from glob import glob
 from subprocess import CompletedProcess
 
-from config.state import config, CONFIG_DEFAULTS
+from kupferbootstrap.config.state import config, CONFIG_DEFAULTS
-from constants import SRCINFO_METADATA_FILE
+from kupferbootstrap.constants import SRCINFO_METADATA_FILE
-from exec.cmd import run_cmd
+from kupferbootstrap.exec.cmd import run_cmd
-from exec.file import get_temp_dir
+from kupferbootstrap.exec.file import get_temp_dir
-from logger import setup_logging
+from kupferbootstrap.logger import setup_logging
-from packages.cli import SRCINFO_CACHE_FILES, cmd_build, cmd_clean, cmd_init, cmd_update
+from kupferbootstrap.packages.cli import SRCINFO_CACHE_FILES, cmd_build, cmd_clean, cmd_init, cmd_update
-from utils import git_get_branch
+from kupferbootstrap.utils import git_get_branch
 
 tempdir = None
 config.try_load_file()

src/kupferbootstrap/packages/build.py

@@ -9,18 +9,18 @@ from copy import deepcopy
 from urllib.error import HTTPError
 from typing import Iterable, Iterator, Optional
 
-from binfmt.binfmt import binfmt_is_registered, binfmt_register
+from kupferbootstrap.binfmt.binfmt import binfmt_is_registered, binfmt_register
-from constants import CROSSDIRECT_PKGS, QEMU_BINFMT_PKGS, GCC_HOSTSPECS, ARCHES, Arch, CHROOT_PATHS, MAKEPKG_CMD
+from kupferbootstrap.constants import CROSSDIRECT_PKGS, QEMU_BINFMT_PKGS, GCC_HOSTSPECS, ARCHES, Arch, CHROOT_PATHS, MAKEPKG_CMD
-from config.state import config
+from kupferbootstrap.config.state import config
-from exec.cmd import run_cmd, run_root_cmd
+from kupferbootstrap.exec.cmd import run_cmd, run_root_cmd
-from exec.file import makedir, remove_file, symlink
+from kupferbootstrap.exec.file import makedir, remove_file, symlink
-from chroot.build import get_build_chroot, BuildChroot
+from kupferbootstrap.chroot.build import get_build_chroot, BuildChroot
-from distro.distro import get_kupfer_https, get_kupfer_local, get_kupfer_repo_names
+from kupferbootstrap.distro.distro import get_kupfer_https, get_kupfer_local, get_kupfer_repo_names
-from distro.package import RemotePackage, LocalPackage
+from kupferbootstrap.distro.package import RemotePackage, LocalPackage
-from distro.repo import LocalRepo
+from kupferbootstrap.distro.repo import LocalRepo
-from progressbar import BAR_PADDING, get_levels_bar
+from kupferbootstrap.progressbar import BAR_PADDING, get_levels_bar
-from wrapper import check_programs_wrap, is_wrapped
+from kupferbootstrap.wrapper import check_programs_wrap, is_wrapped
-from utils import ellipsize, sha256sum
+from kupferbootstrap.utils import ellipsize, sha256sum
 
 from .pkgbuild import discover_pkgbuilds, filter_pkgbuilds, Pkgbase, Pkgbuild, SubPkgbuild
 

src/kupferbootstrap/progressbar.py

@@ -4,7 +4,7 @@ import sys
 from enlighten import Counter, Manager, get_manager as _getmanager
 from typing import Hashable, Optional
 
-from config.state import config
+from .config.state import config
 
 BAR_PADDING = 25
 DEFAULT_OUTPUT = sys.stderr