From bdcc188f053da4f05d27a87efd59b88763fc6567 Mon Sep 17 00:00:00 2001 From: Stefan Hansson Date: Tue, 4 Feb 2025 16:21:59 +0100 Subject: [PATCH] pmb: Use explicit re-exports (MR 2545) See https://docs.astral.sh/ruff/rules/unused-import --- pmb/__init__.py | 2 +- pmb/build/__init__.py | 32 ++++++++++++++++++++------------ pmb/chroot/__init__.py | 20 +++++++++++++++----- pmb/config/__init__.py | 8 ++++---- pmb/core/__init__.py | 6 +++--- pmb/export/__init__.py | 6 +++--- pmb/flasher/__init__.py | 10 +++++----- pmb/install/__init__.py | 14 +++++++------- pmb/parse/__init__.py | 21 +++++++++++++-------- pmb/qemu/__init__.py | 2 +- 10 files changed, 72 insertions(+), 49 deletions(-) diff --git a/pmb/__init__.py b/pmb/__init__.py index 083b27dd..bf5d7727 100644 --- a/pmb/__init__.py +++ b/pmb/__init__.py @@ -15,7 +15,7 @@ if TYPE_CHECKING: from . import config from . import parse from .config import init as config_init, require_programs -from .helpers import frontend +from .helpers import frontend as frontend from .helpers import logging from .helpers import mount from .helpers import other diff --git a/pmb/build/__init__.py b/pmb/build/__init__.py index 47686600..dea6f901 100644 --- a/pmb/build/__init__.py +++ b/pmb/build/__init__.py @@ -1,15 +1,23 @@ # Copyright 2023 Oliver Smith # SPDX-License-Identifier: GPL-3.0-or-later -from pmb.build.init import init, init_abuild_minimal, init_compiler -from pmb.build.envkernel import package_kernel -from pmb.build.newapkbuild import newapkbuild -from pmb.build.other import copy_to_buildpath, get_status, index_repo -from .backend import mount_pmaports -from pmb.build._package import ( - BootstrapStage, - packages, - output_path, - BuildQueueItem, - get_apkbuild, - get_depends, +from pmb.build.init import ( + init as init, + init_abuild_minimal as init_abuild_minimal, + init_compiler as init_compiler, +) +from pmb.build.envkernel import package_kernel as package_kernel +from pmb.build.newapkbuild import newapkbuild as newapkbuild +from pmb.build.other import ( + copy_to_buildpath as copy_to_buildpath, + get_status as get_status, + index_repo as index_repo, +) +from .backend import mount_pmaports as mount_pmaports +from pmb.build._package import ( + BootstrapStage as BootstrapStage, + packages as packages, + output_path as output_path, + BuildQueueItem as BuildQueueItem, + get_apkbuild as get_apkbuild, + get_depends as get_depends, ) diff --git a/pmb/chroot/__init__.py b/pmb/chroot/__init__.py index 8958e130..1db3e2a0 100644 --- a/pmb/chroot/__init__.py +++ b/pmb/chroot/__init__.py @@ -1,7 +1,17 @@ # Copyright 2023 Oliver Smith # SPDX-License-Identifier: GPL-3.0-or-later -from pmb.chroot.init import init, init_keys, UsrMerge -from pmb.chroot.mount import mount, mount_native_into_foreign, remove_mnt_pmbootstrap -from pmb.chroot.run import root, rootm, user, userm, exists as user_exists -from pmb.chroot.shutdown import shutdown -from pmb.chroot.zap import zap, del_chroot +from pmb.chroot.init import init as init, init_keys as init_keys, UsrMerge as UsrMerge +from pmb.chroot.mount import ( + mount as mount, + mount_native_into_foreign as mount_native_into_foreign, + remove_mnt_pmbootstrap as remove_mnt_pmbootstrap, +) +from pmb.chroot.run import ( + root as root, + rootm as rootm, + user as user, + userm as userm, + exists as user_exists, +) +from pmb.chroot.shutdown import shutdown as shutdown +from pmb.chroot.zap import zap as zap, del_chroot as del_chroot diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py index f8ced8ee..50c746a2 100644 --- a/pmb/config/__init__.py +++ b/pmb/config/__init__.py @@ -11,11 +11,11 @@ from collections.abc import Sequence # # FIXME (#2324): this sucks, we should re-organise this and not rely on "lifting" # this functions this way -from pmb.config.file import load, save, serialize +from pmb.config.file import load as load, save as save, serialize as serialize from pmb.config.sudo import which_sudo -from pmb.config.other import is_systemd_selected -from .init import require_programs -from . import workdir +from pmb.config.other import is_systemd_selected as is_systemd_selected +from .init import require_programs as require_programs +from . import workdir as workdir # diff --git a/pmb/core/__init__.py b/pmb/core/__init__.py index 1659a578..be5626ee 100644 --- a/pmb/core/__init__.py +++ b/pmb/core/__init__.py @@ -1,6 +1,6 @@ # Copyright 2024 Caleb Connolly # SPDX-License-Identifier: GPL-3.0-or-later -from .chroot import Chroot, ChrootType -from .context import Context -from .config import Config +from .chroot import Chroot as Chroot, ChrootType as ChrootType +from .context import Context as Context +from .config import Config as Config diff --git a/pmb/export/__init__.py b/pmb/export/__init__.py index 40656df9..7e9cb172 100644 --- a/pmb/export/__init__.py +++ b/pmb/export/__init__.py @@ -1,5 +1,5 @@ # Copyright 2023 Oliver Smith # SPDX-License-Identifier: GPL-3.0-or-later -from pmb.export.frontend import frontend -from pmb.export.odin import odin -from pmb.export.symlinks import symlinks +from pmb.export.frontend import frontend as frontend +from pmb.export.odin import odin as odin +from pmb.export.symlinks import symlinks as symlinks diff --git a/pmb/flasher/__init__.py b/pmb/flasher/__init__.py index 6b163ce1..ea7b6bcd 100644 --- a/pmb/flasher/__init__.py +++ b/pmb/flasher/__init__.py @@ -1,7 +1,7 @@ # Copyright 2023 Oliver Smith # SPDX-License-Identifier: GPL-3.0-or-later -from pmb.flasher.init import init -from pmb.flasher.init import install_depends -from pmb.flasher.run import run -from pmb.flasher.run import check_partition_blacklist -from pmb.flasher.variables import variables +from pmb.flasher.init import init as init +from pmb.flasher.init import install_depends as install_depends +from pmb.flasher.run import run as run +from pmb.flasher.run import check_partition_blacklist as check_partition_blacklist +from pmb.flasher.variables import variables as variables diff --git a/pmb/install/__init__.py b/pmb/install/__init__.py index d44288ce..852c45f2 100644 --- a/pmb/install/__init__.py +++ b/pmb/install/__init__.py @@ -1,9 +1,9 @@ # Copyright 2023 Oliver Smith # SPDX-License-Identifier: GPL-3.0-or-later -from pmb.install._install import install -from pmb.install._install import get_kernel_package -from pmb.install.partition import partition -from pmb.install.partition import partition_cgpt -from pmb.install.format import format -from pmb.install.format import get_root_filesystem -from pmb.install.partition import partitions_mount +from pmb.install._install import install as install +from pmb.install._install import get_kernel_package as get_kernel_package +from pmb.install.partition import partition as partition +from pmb.install.partition import partition_cgpt as partition_cgpt +from pmb.install.format import format as format +from pmb.install.format import get_root_filesystem as get_root_filesystem +from pmb.install.partition import partitions_mount as partitions_mount diff --git a/pmb/parse/__init__.py b/pmb/parse/__init__.py index 9a9c77b4..87dee8ab 100644 --- a/pmb/parse/__init__.py +++ b/pmb/parse/__init__.py @@ -1,10 +1,15 @@ # Copyright 2023 Oliver Smith # SPDX-License-Identifier: GPL-3.0-or-later -from pmb.parse.arguments import arguments, arguments_install, arguments_flasher, get_parser -from pmb.parse._apkbuild import apkbuild -from pmb.parse._apkbuild import function_body -from pmb.parse.binfmt_info import binfmt_info -from pmb.parse.deviceinfo import deviceinfo -from pmb.parse.kconfig import check -from pmb.parse.bootimg import bootimg -from pmb.parse.cpuinfo import arm_big_little_first_group_ncpus +from pmb.parse.arguments import ( + arguments as arguments, + arguments_install as arguments_install, + arguments_flasher as arguments_flasher, + get_parser as get_parser, +) +from pmb.parse._apkbuild import apkbuild as apkbuild +from pmb.parse._apkbuild import function_body as function_body +from pmb.parse.binfmt_info import binfmt_info as binfmt_info +from pmb.parse.deviceinfo import deviceinfo as deviceinfo +from pmb.parse.kconfig import check as check +from pmb.parse.bootimg import bootimg as bootimg +from pmb.parse.cpuinfo import arm_big_little_first_group_ncpus as arm_big_little_first_group_ncpus diff --git a/pmb/qemu/__init__.py b/pmb/qemu/__init__.py index ff4980c0..e436f569 100644 --- a/pmb/qemu/__init__.py +++ b/pmb/qemu/__init__.py @@ -1,3 +1,3 @@ # Copyright 2023 Pablo Castellano # SPDX-License-Identifier: GPL-3.0-or-later -from pmb.qemu.run import run +from pmb.qemu.run import run as run