Skip to content

Commit e4faba2

Browse files
authored
Convert imports to absolute imports (archlinux#4196)
* Enable ruff absolute import check * Convert all relative imports to absolute * Update * Update
1 parent c92a457 commit e4faba2

54 files changed

Lines changed: 195 additions & 248 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

archinstall/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
from .lib.plugins import plugin
1+
from archinstall.lib.plugins import plugin
22

33
__all__ = ['plugin']

archinstall/default_profiles/profile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
from archinstall.lib.translationhandler import tr
77

88
if TYPE_CHECKING:
9-
from ..lib.installer import Installer
10-
from ..lib.models.users import User
9+
from archinstall.lib.installer import Installer
10+
from archinstall.lib.models.users import User
1111

1212

1313
class ProfileType(Enum):

archinstall/lib/boot.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
from types import TracebackType
66
from typing import TYPE_CHECKING, ClassVar, Self
77

8-
from .command import SysCommand, SysCommandWorker, locate_binary
9-
from .exceptions import SysCallError
10-
from .output import error
8+
from archinstall.lib.command import SysCommand, SysCommandWorker, locate_binary
9+
from archinstall.lib.exceptions import SysCallError
10+
from archinstall.lib.output import error
1111

1212
if TYPE_CHECKING:
13-
from .installer import Installer
13+
from archinstall.lib.installer import Installer
1414

1515

1616
class Boot:

archinstall/lib/bootloader/bootloader_menu.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import textwrap
22
from typing import override
33

4+
from archinstall.lib.menu.abstract_menu import AbstractSubMenu
45
from archinstall.lib.menu.helpers import Confirmation, Selection
6+
from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguration
57
from archinstall.lib.translationhandler import tr
68
from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
79
from archinstall.tui.ui.result import ResultType
810

9-
from ..menu.abstract_menu import AbstractSubMenu
10-
from ..models.bootloader import Bootloader, BootloaderConfiguration
11-
1211

1312
class BootloaderMenu(AbstractSubMenu[BootloaderConfiguration]):
1413
def __init__(

archinstall/lib/configuration.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@
66

77
from pydantic import TypeAdapter
88

9+
from archinstall.lib.args import ArchConfig
10+
from archinstall.lib.crypt import encrypt
911
from archinstall.lib.menu.helpers import Confirmation, Selection
12+
from archinstall.lib.menu.util import get_password, prompt_dir
13+
from archinstall.lib.output import debug, logger, warn
1014
from archinstall.lib.translationhandler import tr
1115
from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
1216
from archinstall.tui.ui.result import ResultType
1317

14-
from .args import ArchConfig
15-
from .crypt import encrypt
16-
from .menu.util import get_password, prompt_dir
17-
from .output import debug, logger, warn
18-
1918

2019
class ConfigurationOutput:
2120
def __init__(self, config: ArchConfig):

archinstall/lib/crypt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from cryptography.fernet import Fernet, InvalidToken
77
from cryptography.hazmat.primitives.kdf.argon2 import Argon2id
88

9-
from .output import debug
9+
from archinstall.lib.output import debug
1010

1111
libcrypt = ctypes.CDLL('libcrypt.so')
1212

archinstall/lib/disk/device_handler.py

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55

66
from parted import Device, Disk, DiskException, FileSystem, Geometry, IOException, Partition, PartitionException, freshDisk, getAllDevices, getDevice, newDisk
77

8-
from ..command import SysCommand, SysCommandWorker
9-
from ..exceptions import DiskError, SysCallError, UnknownFilesystemFormat
10-
from ..luks import Luks2, unlock_luks2_dev
11-
from ..models.device import (
8+
from archinstall.lib.command import SysCommand, SysCommandWorker
9+
from archinstall.lib.disk.utils import find_lsblk_info, get_all_lsblk_info, get_lsblk_info, mount, umount
10+
from archinstall.lib.exceptions import DiskError, SysCallError, UnknownFilesystemFormat
11+
from archinstall.lib.luks import Luks2, unlock_luks2_dev
12+
from archinstall.lib.models.device import (
1213
DEFAULT_ITER_TIME,
1314
BDevice,
1415
BtrfsMountOption,
@@ -30,16 +31,9 @@
3031
_DeviceInfo,
3132
_PartitionInfo,
3233
)
33-
from ..models.users import Password
34-
from ..output import debug, error, info, log
35-
from ..utils.util import is_subpath
36-
from .utils import (
37-
find_lsblk_info,
38-
get_all_lsblk_info,
39-
get_lsblk_info,
40-
mount,
41-
umount,
42-
)
34+
from archinstall.lib.models.users import Password
35+
from archinstall.lib.output import debug, error, info, log
36+
from archinstall.lib.utils.util import is_subpath
4337

4438

4539
class DeviceHandler:

archinstall/lib/disk/disk_menu.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
from typing import override
33

44
from archinstall.lib.disk.encryption_menu import DiskEncryptionMenu
5+
from archinstall.lib.interactions.disk_conf import select_disk_config, select_lvm_config
6+
from archinstall.lib.menu.abstract_menu import AbstractSubMenu
57
from archinstall.lib.menu.helpers import Selection
68
from archinstall.lib.models.device import (
79
DEFAULT_ITER_TIME,
@@ -14,14 +16,11 @@
1416
SnapshotConfig,
1517
SnapshotType,
1618
)
19+
from archinstall.lib.output import FormattedOutput
1720
from archinstall.lib.translationhandler import tr
1821
from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
1922
from archinstall.tui.ui.result import ResultType
2023

21-
from ..interactions.disk_conf import select_disk_config, select_lvm_config
22-
from ..menu.abstract_menu import AbstractSubMenu
23-
from ..output import FormattedOutput
24-
2524

2625
@dataclass
2726
class DiskMenuConfig:

archinstall/lib/disk/encryption_menu.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
from pathlib import Path
22
from typing import override
33

4+
from archinstall.lib.disk.fido import Fido2
5+
from archinstall.lib.menu.abstract_menu import AbstractSubMenu
46
from archinstall.lib.menu.helpers import Input, Selection, Table
57
from archinstall.lib.menu.menu_helper import MenuHelper
8+
from archinstall.lib.menu.util import get_password
69
from archinstall.lib.models.device import (
10+
DEFAULT_ITER_TIME,
711
DeviceModification,
812
DiskEncryption,
913
EncryptionType,
14+
Fido2Device,
1015
LvmConfiguration,
1116
LvmVolume,
1217
PartitionModification,
1318
)
19+
from archinstall.lib.models.users import Password
20+
from archinstall.lib.output import FormattedOutput
1421
from archinstall.lib.translationhandler import tr
1522
from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
1623
from archinstall.tui.ui.result import ResultType
1724

18-
from ..menu.abstract_menu import AbstractSubMenu
19-
from ..menu.util import get_password
20-
from ..models.device import DEFAULT_ITER_TIME, Fido2Device
21-
from ..models.users import Password
22-
from ..output import FormattedOutput
23-
from .fido import Fido2
24-
2525

2626
class DiskEncryptionMenu(AbstractSubMenu[DiskEncryption]):
2727
def __init__(

archinstall/lib/disk/fido.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
from pathlib import Path
33
from typing import ClassVar
44

5+
from archinstall.lib.command import SysCommand, SysCommandWorker
6+
from archinstall.lib.exceptions import SysCallError
57
from archinstall.lib.models.device import Fido2Device
8+
from archinstall.lib.models.users import Password
9+
from archinstall.lib.output import error, info
610
from archinstall.lib.utils.encoding import clear_vt100_escape_codes_from_str
711

8-
from ..command import SysCommand, SysCommandWorker
9-
from ..exceptions import SysCallError
10-
from ..models.users import Password
11-
from ..output import error, info
12-
1312

1413
class Fido2:
1514
_loaded_cryptsetup: bool = False

0 commit comments

Comments
 (0)