From adeec7a6e3eb8c99eec1ba0fcf41bea6a6867678 Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Sat, 24 Feb 2024 12:45:49 +0100 Subject: [PATCH] move kbs libary files to src/ --- format.sh | 2 +- integration_tests.py | 14 +++++------ {binfmt => src/kupferbootstrap}/__init__.py | 0 .../kupferbootstrap/binfmt}/__init__.py | 0 .../kupferbootstrap/binfmt}/binfmt.py | 0 {binfmt => src/kupferbootstrap/binfmt}/cli.py | 0 .../kupferbootstrap/cache}/__init__.py | 0 {cache => src/kupferbootstrap/cache}/cli.py | 0 .../kupferbootstrap/chroot}/__init__.py | 0 .../kupferbootstrap/chroot}/abstract.py | 0 .../kupferbootstrap/chroot}/base.py | 0 .../kupferbootstrap/chroot}/build.py | 0 {chroot => src/kupferbootstrap/chroot}/cli.py | 0 .../kupferbootstrap/chroot}/device.py | 0 .../kupferbootstrap/chroot}/helpers.py | 0 .../kupferbootstrap/config}/__init__.py | 0 {config => src/kupferbootstrap/config}/cli.py | 0 .../kupferbootstrap/config}/profile.py | 0 .../kupferbootstrap/config}/scheme.py | 0 .../kupferbootstrap/config}/state.py | 0 .../kupferbootstrap/config}/test_config.py | 0 .../kupferbootstrap/constants.py | 0 .../kupferbootstrap/devices}/__init__.py | 0 .../kupferbootstrap/devices}/cli.py | 0 .../kupferbootstrap/devices}/device.py | 0 .../kupferbootstrap/devices}/deviceinfo.py | 0 .../kupferbootstrap/devices}/test_device.py | 0 .../devices}/test_deviceinfo.py | 0 .../kupferbootstrap/dictscheme.py | 0 .../kupferbootstrap/distro}/__init__.py | 0 .../kupferbootstrap/distro}/distro.py | 0 .../kupferbootstrap/distro}/package.py | 0 .../kupferbootstrap/distro}/repo.py | 0 .../kupferbootstrap/distro}/repo_config.py | 0 .../kupferbootstrap/exec}/__init__.py | 0 {exec => src/kupferbootstrap/exec}/cmd.py | 0 {exec => src/kupferbootstrap/exec}/file.py | 0 .../kupferbootstrap/exec}/test_cmd.py | 0 .../kupferbootstrap/exec}/test_file.py | 0 .../kupferbootstrap/flavours}/__init__.py | 0 .../kupferbootstrap/flavours}/cli.py | 0 .../kupferbootstrap/flavours}/flavour.py | 0 .../kupferbootstrap/flavours}/test_flavour.py | 0 .../kupferbootstrap/generator.py | 0 .../kupferbootstrap/image}/__init__.py | 0 {image => src/kupferbootstrap/image}/boot.py | 0 {image => src/kupferbootstrap/image}/cli.py | 0 .../kupferbootstrap/image}/fastboot.py | 0 {image => src/kupferbootstrap/image}/flash.py | 0 {image => src/kupferbootstrap/image}/image.py | 0 logger.py => src/kupferbootstrap/logger.py | 0 .../kupferbootstrap/net}/__init__.py | 0 {net => src/kupferbootstrap/net}/cli.py | 0 .../kupferbootstrap/net}/forwarding.py | 0 {net => src/kupferbootstrap/net}/ssh.py | 0 {net => src/kupferbootstrap/net}/telnet.py | 0 src/kupferbootstrap/packages/__init__.py | 0 .../kupferbootstrap/packages}/build.py | 24 +++++++++---------- .../kupferbootstrap/packages}/cli.py | 0 .../kupferbootstrap/packages}/pkgbuild.py | 0 .../packages}/srcinfo_cache.py | 0 .../kupferbootstrap/progressbar.py | 2 +- .../kupferbootstrap/typehelpers.py | 0 utils.py => src/kupferbootstrap/utils.py | 0 .../kupferbootstrap/version.txt | 0 .../kupferbootstrap/wrapper}/__init__.py | 0 .../kupferbootstrap/wrapper}/docker.py | 0 .../kupferbootstrap/wrapper}/wrapper.py | 0 68 files changed, 21 insertions(+), 21 deletions(-) rename {binfmt => src/kupferbootstrap}/__init__.py (100%) rename {cache => src/kupferbootstrap/binfmt}/__init__.py (100%) rename {binfmt => src/kupferbootstrap/binfmt}/binfmt.py (100%) rename {binfmt => src/kupferbootstrap/binfmt}/cli.py (100%) rename {chroot => src/kupferbootstrap/cache}/__init__.py (100%) rename {cache => src/kupferbootstrap/cache}/cli.py (100%) rename {config => src/kupferbootstrap/chroot}/__init__.py (100%) rename {chroot => src/kupferbootstrap/chroot}/abstract.py (100%) rename {chroot => src/kupferbootstrap/chroot}/base.py (100%) rename {chroot => src/kupferbootstrap/chroot}/build.py (100%) rename {chroot => src/kupferbootstrap/chroot}/cli.py (100%) rename {chroot => src/kupferbootstrap/chroot}/device.py (100%) rename {chroot => src/kupferbootstrap/chroot}/helpers.py (100%) rename {devices => src/kupferbootstrap/config}/__init__.py (100%) rename {config => src/kupferbootstrap/config}/cli.py (100%) rename {config => src/kupferbootstrap/config}/profile.py (100%) rename {config => src/kupferbootstrap/config}/scheme.py (100%) rename {config => src/kupferbootstrap/config}/state.py (100%) rename {config => src/kupferbootstrap/config}/test_config.py (100%) rename constants.py => src/kupferbootstrap/constants.py (100%) rename {distro => src/kupferbootstrap/devices}/__init__.py (100%) rename {devices => src/kupferbootstrap/devices}/cli.py (100%) rename {devices => src/kupferbootstrap/devices}/device.py (100%) rename {devices => src/kupferbootstrap/devices}/deviceinfo.py (100%) rename {devices => src/kupferbootstrap/devices}/test_device.py (100%) rename {devices => src/kupferbootstrap/devices}/test_deviceinfo.py (100%) rename dictscheme.py => src/kupferbootstrap/dictscheme.py (100%) rename {exec => src/kupferbootstrap/distro}/__init__.py (100%) rename {distro => src/kupferbootstrap/distro}/distro.py (100%) rename {distro => src/kupferbootstrap/distro}/package.py (100%) rename {distro => src/kupferbootstrap/distro}/repo.py (100%) rename {distro => src/kupferbootstrap/distro}/repo_config.py (100%) rename {flavours => src/kupferbootstrap/exec}/__init__.py (100%) rename {exec => src/kupferbootstrap/exec}/cmd.py (100%) rename {exec => src/kupferbootstrap/exec}/file.py (100%) rename {exec => src/kupferbootstrap/exec}/test_cmd.py (100%) rename {exec => src/kupferbootstrap/exec}/test_file.py (100%) rename {image => src/kupferbootstrap/flavours}/__init__.py (100%) rename {flavours => src/kupferbootstrap/flavours}/cli.py (100%) rename {flavours => src/kupferbootstrap/flavours}/flavour.py (100%) rename {flavours => src/kupferbootstrap/flavours}/test_flavour.py (100%) rename generator.py => src/kupferbootstrap/generator.py (100%) rename {net => src/kupferbootstrap/image}/__init__.py (100%) rename {image => src/kupferbootstrap/image}/boot.py (100%) rename {image => src/kupferbootstrap/image}/cli.py (100%) rename {image => src/kupferbootstrap/image}/fastboot.py (100%) rename {image => src/kupferbootstrap/image}/flash.py (100%) rename {image => src/kupferbootstrap/image}/image.py (100%) rename logger.py => src/kupferbootstrap/logger.py (100%) rename {packages => src/kupferbootstrap/net}/__init__.py (100%) rename {net => src/kupferbootstrap/net}/cli.py (100%) rename {net => src/kupferbootstrap/net}/forwarding.py (100%) rename {net => src/kupferbootstrap/net}/ssh.py (100%) rename {net => src/kupferbootstrap/net}/telnet.py (100%) create mode 100644 src/kupferbootstrap/packages/__init__.py rename {packages => src/kupferbootstrap/packages}/build.py (97%) rename {packages => src/kupferbootstrap/packages}/cli.py (100%) rename {packages => src/kupferbootstrap/packages}/pkgbuild.py (100%) rename {packages => src/kupferbootstrap/packages}/srcinfo_cache.py (100%) rename progressbar.py => src/kupferbootstrap/progressbar.py (97%) rename typehelpers.py => src/kupferbootstrap/typehelpers.py (100%) rename utils.py => src/kupferbootstrap/utils.py (100%) rename version.txt => src/kupferbootstrap/version.txt (100%) rename {wrapper => src/kupferbootstrap/wrapper}/__init__.py (100%) rename {wrapper => src/kupferbootstrap/wrapper}/docker.py (100%) rename {wrapper => src/kupferbootstrap/wrapper}/wrapper.py (100%) diff --git a/format.sh b/format.sh index 6860c4e..9f0fbe9 100755 --- a/format.sh +++ b/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[@]}" diff --git a/integration_tests.py b/integration_tests.py index bc4eeb7..67a073b 100644 --- a/integration_tests.py +++ b/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 constants import SRCINFO_METADATA_FILE -from exec.cmd import run_cmd -from exec.file import get_temp_dir -from logger import setup_logging -from packages.cli import SRCINFO_CACHE_FILES, cmd_build, cmd_clean, cmd_init, cmd_update -from utils import git_get_branch +from kupferbootstrap.config.state import config, CONFIG_DEFAULTS +from kupferbootstrap.constants import SRCINFO_METADATA_FILE +from kupferbootstrap.exec.cmd import run_cmd +from kupferbootstrap.exec.file import get_temp_dir +from kupferbootstrap.logger import setup_logging +from kupferbootstrap.packages.cli import SRCINFO_CACHE_FILES, cmd_build, cmd_clean, cmd_init, cmd_update +from kupferbootstrap.utils import git_get_branch tempdir = None config.try_load_file() diff --git a/binfmt/__init__.py b/src/kupferbootstrap/__init__.py similarity index 100% rename from binfmt/__init__.py rename to src/kupferbootstrap/__init__.py diff --git a/cache/__init__.py b/src/kupferbootstrap/binfmt/__init__.py similarity index 100% rename from cache/__init__.py rename to src/kupferbootstrap/binfmt/__init__.py diff --git a/binfmt/binfmt.py b/src/kupferbootstrap/binfmt/binfmt.py similarity index 100% rename from binfmt/binfmt.py rename to src/kupferbootstrap/binfmt/binfmt.py diff --git a/binfmt/cli.py b/src/kupferbootstrap/binfmt/cli.py similarity index 100% rename from binfmt/cli.py rename to src/kupferbootstrap/binfmt/cli.py diff --git a/chroot/__init__.py b/src/kupferbootstrap/cache/__init__.py similarity index 100% rename from chroot/__init__.py rename to src/kupferbootstrap/cache/__init__.py diff --git a/cache/cli.py b/src/kupferbootstrap/cache/cli.py similarity index 100% rename from cache/cli.py rename to src/kupferbootstrap/cache/cli.py diff --git a/config/__init__.py b/src/kupferbootstrap/chroot/__init__.py similarity index 100% rename from config/__init__.py rename to src/kupferbootstrap/chroot/__init__.py diff --git a/chroot/abstract.py b/src/kupferbootstrap/chroot/abstract.py similarity index 100% rename from chroot/abstract.py rename to src/kupferbootstrap/chroot/abstract.py diff --git a/chroot/base.py b/src/kupferbootstrap/chroot/base.py similarity index 100% rename from chroot/base.py rename to src/kupferbootstrap/chroot/base.py diff --git a/chroot/build.py b/src/kupferbootstrap/chroot/build.py similarity index 100% rename from chroot/build.py rename to src/kupferbootstrap/chroot/build.py diff --git a/chroot/cli.py b/src/kupferbootstrap/chroot/cli.py similarity index 100% rename from chroot/cli.py rename to src/kupferbootstrap/chroot/cli.py diff --git a/chroot/device.py b/src/kupferbootstrap/chroot/device.py similarity index 100% rename from chroot/device.py rename to src/kupferbootstrap/chroot/device.py diff --git a/chroot/helpers.py b/src/kupferbootstrap/chroot/helpers.py similarity index 100% rename from chroot/helpers.py rename to src/kupferbootstrap/chroot/helpers.py diff --git a/devices/__init__.py b/src/kupferbootstrap/config/__init__.py similarity index 100% rename from devices/__init__.py rename to src/kupferbootstrap/config/__init__.py diff --git a/config/cli.py b/src/kupferbootstrap/config/cli.py similarity index 100% rename from config/cli.py rename to src/kupferbootstrap/config/cli.py diff --git a/config/profile.py b/src/kupferbootstrap/config/profile.py similarity index 100% rename from config/profile.py rename to src/kupferbootstrap/config/profile.py diff --git a/config/scheme.py b/src/kupferbootstrap/config/scheme.py similarity index 100% rename from config/scheme.py rename to src/kupferbootstrap/config/scheme.py diff --git a/config/state.py b/src/kupferbootstrap/config/state.py similarity index 100% rename from config/state.py rename to src/kupferbootstrap/config/state.py diff --git a/config/test_config.py b/src/kupferbootstrap/config/test_config.py similarity index 100% rename from config/test_config.py rename to src/kupferbootstrap/config/test_config.py diff --git a/constants.py b/src/kupferbootstrap/constants.py similarity index 100% rename from constants.py rename to src/kupferbootstrap/constants.py diff --git a/distro/__init__.py b/src/kupferbootstrap/devices/__init__.py similarity index 100% rename from distro/__init__.py rename to src/kupferbootstrap/devices/__init__.py diff --git a/devices/cli.py b/src/kupferbootstrap/devices/cli.py similarity index 100% rename from devices/cli.py rename to src/kupferbootstrap/devices/cli.py diff --git a/devices/device.py b/src/kupferbootstrap/devices/device.py similarity index 100% rename from devices/device.py rename to src/kupferbootstrap/devices/device.py diff --git a/devices/deviceinfo.py b/src/kupferbootstrap/devices/deviceinfo.py similarity index 100% rename from devices/deviceinfo.py rename to src/kupferbootstrap/devices/deviceinfo.py diff --git a/devices/test_device.py b/src/kupferbootstrap/devices/test_device.py similarity index 100% rename from devices/test_device.py rename to src/kupferbootstrap/devices/test_device.py diff --git a/devices/test_deviceinfo.py b/src/kupferbootstrap/devices/test_deviceinfo.py similarity index 100% rename from devices/test_deviceinfo.py rename to src/kupferbootstrap/devices/test_deviceinfo.py diff --git a/dictscheme.py b/src/kupferbootstrap/dictscheme.py similarity index 100% rename from dictscheme.py rename to src/kupferbootstrap/dictscheme.py diff --git a/exec/__init__.py b/src/kupferbootstrap/distro/__init__.py similarity index 100% rename from exec/__init__.py rename to src/kupferbootstrap/distro/__init__.py diff --git a/distro/distro.py b/src/kupferbootstrap/distro/distro.py similarity index 100% rename from distro/distro.py rename to src/kupferbootstrap/distro/distro.py diff --git a/distro/package.py b/src/kupferbootstrap/distro/package.py similarity index 100% rename from distro/package.py rename to src/kupferbootstrap/distro/package.py diff --git a/distro/repo.py b/src/kupferbootstrap/distro/repo.py similarity index 100% rename from distro/repo.py rename to src/kupferbootstrap/distro/repo.py diff --git a/distro/repo_config.py b/src/kupferbootstrap/distro/repo_config.py similarity index 100% rename from distro/repo_config.py rename to src/kupferbootstrap/distro/repo_config.py diff --git a/flavours/__init__.py b/src/kupferbootstrap/exec/__init__.py similarity index 100% rename from flavours/__init__.py rename to src/kupferbootstrap/exec/__init__.py diff --git a/exec/cmd.py b/src/kupferbootstrap/exec/cmd.py similarity index 100% rename from exec/cmd.py rename to src/kupferbootstrap/exec/cmd.py diff --git a/exec/file.py b/src/kupferbootstrap/exec/file.py similarity index 100% rename from exec/file.py rename to src/kupferbootstrap/exec/file.py diff --git a/exec/test_cmd.py b/src/kupferbootstrap/exec/test_cmd.py similarity index 100% rename from exec/test_cmd.py rename to src/kupferbootstrap/exec/test_cmd.py diff --git a/exec/test_file.py b/src/kupferbootstrap/exec/test_file.py similarity index 100% rename from exec/test_file.py rename to src/kupferbootstrap/exec/test_file.py diff --git a/image/__init__.py b/src/kupferbootstrap/flavours/__init__.py similarity index 100% rename from image/__init__.py rename to src/kupferbootstrap/flavours/__init__.py diff --git a/flavours/cli.py b/src/kupferbootstrap/flavours/cli.py similarity index 100% rename from flavours/cli.py rename to src/kupferbootstrap/flavours/cli.py diff --git a/flavours/flavour.py b/src/kupferbootstrap/flavours/flavour.py similarity index 100% rename from flavours/flavour.py rename to src/kupferbootstrap/flavours/flavour.py diff --git a/flavours/test_flavour.py b/src/kupferbootstrap/flavours/test_flavour.py similarity index 100% rename from flavours/test_flavour.py rename to src/kupferbootstrap/flavours/test_flavour.py diff --git a/generator.py b/src/kupferbootstrap/generator.py similarity index 100% rename from generator.py rename to src/kupferbootstrap/generator.py diff --git a/net/__init__.py b/src/kupferbootstrap/image/__init__.py similarity index 100% rename from net/__init__.py rename to src/kupferbootstrap/image/__init__.py diff --git a/image/boot.py b/src/kupferbootstrap/image/boot.py similarity index 100% rename from image/boot.py rename to src/kupferbootstrap/image/boot.py diff --git a/image/cli.py b/src/kupferbootstrap/image/cli.py similarity index 100% rename from image/cli.py rename to src/kupferbootstrap/image/cli.py diff --git a/image/fastboot.py b/src/kupferbootstrap/image/fastboot.py similarity index 100% rename from image/fastboot.py rename to src/kupferbootstrap/image/fastboot.py diff --git a/image/flash.py b/src/kupferbootstrap/image/flash.py similarity index 100% rename from image/flash.py rename to src/kupferbootstrap/image/flash.py diff --git a/image/image.py b/src/kupferbootstrap/image/image.py similarity index 100% rename from image/image.py rename to src/kupferbootstrap/image/image.py diff --git a/logger.py b/src/kupferbootstrap/logger.py similarity index 100% rename from logger.py rename to src/kupferbootstrap/logger.py diff --git a/packages/__init__.py b/src/kupferbootstrap/net/__init__.py similarity index 100% rename from packages/__init__.py rename to src/kupferbootstrap/net/__init__.py diff --git a/net/cli.py b/src/kupferbootstrap/net/cli.py similarity index 100% rename from net/cli.py rename to src/kupferbootstrap/net/cli.py diff --git a/net/forwarding.py b/src/kupferbootstrap/net/forwarding.py similarity index 100% rename from net/forwarding.py rename to src/kupferbootstrap/net/forwarding.py diff --git a/net/ssh.py b/src/kupferbootstrap/net/ssh.py similarity index 100% rename from net/ssh.py rename to src/kupferbootstrap/net/ssh.py diff --git a/net/telnet.py b/src/kupferbootstrap/net/telnet.py similarity index 100% rename from net/telnet.py rename to src/kupferbootstrap/net/telnet.py diff --git a/src/kupferbootstrap/packages/__init__.py b/src/kupferbootstrap/packages/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/packages/build.py b/src/kupferbootstrap/packages/build.py similarity index 97% rename from packages/build.py rename to src/kupferbootstrap/packages/build.py index b388221..4274abf 100644 --- a/packages/build.py +++ b/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 constants import CROSSDIRECT_PKGS, QEMU_BINFMT_PKGS, GCC_HOSTSPECS, ARCHES, Arch, CHROOT_PATHS, MAKEPKG_CMD -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 -from distro.distro import get_kupfer_https, get_kupfer_local, get_kupfer_repo_names -from distro.package import RemotePackage, LocalPackage -from distro.repo import LocalRepo -from progressbar import BAR_PADDING, get_levels_bar -from wrapper import check_programs_wrap, is_wrapped -from utils import ellipsize, sha256sum +from kupferbootstrap.binfmt.binfmt import binfmt_is_registered, binfmt_register +from kupferbootstrap.constants import CROSSDIRECT_PKGS, QEMU_BINFMT_PKGS, GCC_HOSTSPECS, ARCHES, Arch, CHROOT_PATHS, MAKEPKG_CMD +from kupferbootstrap.config.state import config +from kupferbootstrap.exec.cmd import run_cmd, run_root_cmd +from kupferbootstrap.exec.file import makedir, remove_file, symlink +from kupferbootstrap.chroot.build import get_build_chroot, BuildChroot +from kupferbootstrap.distro.distro import get_kupfer_https, get_kupfer_local, get_kupfer_repo_names +from kupferbootstrap.distro.package import RemotePackage, LocalPackage +from kupferbootstrap.distro.repo import LocalRepo +from kupferbootstrap.progressbar import BAR_PADDING, get_levels_bar +from kupferbootstrap.wrapper import check_programs_wrap, is_wrapped +from kupferbootstrap.utils import ellipsize, sha256sum from .pkgbuild import discover_pkgbuilds, filter_pkgbuilds, Pkgbase, Pkgbuild, SubPkgbuild diff --git a/packages/cli.py b/src/kupferbootstrap/packages/cli.py similarity index 100% rename from packages/cli.py rename to src/kupferbootstrap/packages/cli.py diff --git a/packages/pkgbuild.py b/src/kupferbootstrap/packages/pkgbuild.py similarity index 100% rename from packages/pkgbuild.py rename to src/kupferbootstrap/packages/pkgbuild.py diff --git a/packages/srcinfo_cache.py b/src/kupferbootstrap/packages/srcinfo_cache.py similarity index 100% rename from packages/srcinfo_cache.py rename to src/kupferbootstrap/packages/srcinfo_cache.py diff --git a/progressbar.py b/src/kupferbootstrap/progressbar.py similarity index 97% rename from progressbar.py rename to src/kupferbootstrap/progressbar.py index bfb450a..8899da8 100644 --- a/progressbar.py +++ b/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 diff --git a/typehelpers.py b/src/kupferbootstrap/typehelpers.py similarity index 100% rename from typehelpers.py rename to src/kupferbootstrap/typehelpers.py diff --git a/utils.py b/src/kupferbootstrap/utils.py similarity index 100% rename from utils.py rename to src/kupferbootstrap/utils.py diff --git a/version.txt b/src/kupferbootstrap/version.txt similarity index 100% rename from version.txt rename to src/kupferbootstrap/version.txt diff --git a/wrapper/__init__.py b/src/kupferbootstrap/wrapper/__init__.py similarity index 100% rename from wrapper/__init__.py rename to src/kupferbootstrap/wrapper/__init__.py diff --git a/wrapper/docker.py b/src/kupferbootstrap/wrapper/docker.py similarity index 100% rename from wrapper/docker.py rename to src/kupferbootstrap/wrapper/docker.py diff --git a/wrapper/wrapper.py b/src/kupferbootstrap/wrapper/wrapper.py similarity index 100% rename from wrapper/wrapper.py rename to src/kupferbootstrap/wrapper/wrapper.py