diff --git a/archinstall/lib/menu/list_manager.py b/archinstall/lib/menu/list_manager.py index 2ee6677a83..8c8988962e 100644 --- a/archinstall/lib/menu/list_manager.py +++ b/archinstall/lib/menu/list_manager.py @@ -40,7 +40,7 @@ def __init__( self._original_data = copy.deepcopy(entries) self._data = copy.deepcopy(entries) - self._prompt: str | None = prompt + self._prompt = prompt self._separator = '' self._confirm_action = str(_('Confirm and exit')) diff --git a/archinstall/lib/output.py b/archinstall/lib/output.py index adfe2e6998..c869b20cc7 100644 --- a/archinstall/lib/output.py +++ b/archinstall/lib/output.py @@ -321,7 +321,7 @@ def log( if _supports_color(): text = _stylize_output(text, fg, bg, reset, font) - log_file: Path = storage['LOG_PATH'] / storage['LOG_FILE'] + log_file = storage['LOG_PATH'] / storage['LOG_FILE'] with log_file.open('a') as fp: ts = _timestamp() diff --git a/archinstall/scripts/guided.py b/archinstall/scripts/guided.py index e137728998..147ac2fe79 100644 --- a/archinstall/scripts/guided.py +++ b/archinstall/scripts/guided.py @@ -2,20 +2,18 @@ from pathlib import Path from archinstall import SysInfo -from archinstall.lib.args import ArchConfig, arch_config_handler +from archinstall.lib.args import arch_config_handler from archinstall.lib.configuration import ConfigurationOutput from archinstall.lib.disk.filesystem import FilesystemHandler from archinstall.lib.disk.utils import disk_layouts from archinstall.lib.global_menu import GlobalMenu from archinstall.lib.installer import Installer, accessibility_tools_in_use, run_custom_user_commands from archinstall.lib.interactions.general_conf import PostInstallationAction, ask_post_installation -from archinstall.lib.models import AudioConfiguration, Bootloader +from archinstall.lib.models import Bootloader from archinstall.lib.models.device_model import ( - DiskLayoutConfiguration, DiskLayoutType, EncryptionType, ) -from archinstall.lib.models.network_configuration import NetworkConfiguration from archinstall.lib.models.users import User from archinstall.lib.output import debug, error, info from archinstall.lib.profile.profiles_handler import profile_handler @@ -46,13 +44,13 @@ def perform_installation(mountpoint: Path) -> None: """ info('Starting installation...') - config: ArchConfig = arch_config_handler.config + config = arch_config_handler.config if not config.disk_config: error("No disk configuration provided") return - disk_config: DiskLayoutConfiguration = config.disk_config + disk_config = config.disk_config run_mkinitcpio = not config.uki locale_config = config.locale_config disk_encryption = config.disk_encryption @@ -98,7 +96,7 @@ def perform_installation(mountpoint: Path) -> None: # If user selected to copy the current ISO network configuration # Perform a copy of the config - network_config: NetworkConfiguration | None = config.network_config + network_config = config.network_config if network_config: network_config.install_network_config( @@ -109,7 +107,7 @@ def perform_installation(mountpoint: Path) -> None: if users := config.users: installation.create_users(users) - audio_config: AudioConfiguration | None = config.audio_config + audio_config = config.audio_config if audio_config: audio_config.install_audio_config(installation) else: diff --git a/archinstall/scripts/minimal.py b/archinstall/scripts/minimal.py index 957199f61b..81537a2807 100644 --- a/archinstall/scripts/minimal.py +++ b/archinstall/scripts/minimal.py @@ -1,17 +1,13 @@ from pathlib import Path from archinstall.default_profiles.minimal import MinimalProfile -from archinstall.lib.args import ArchConfig, arch_config_handler +from archinstall.lib.args import arch_config_handler from archinstall.lib.configuration import ConfigurationOutput from archinstall.lib.disk.disk_menu import DiskLayoutConfigurationMenu from archinstall.lib.disk.encryption_menu import DiskEncryptionMenu from archinstall.lib.disk.filesystem import FilesystemHandler from archinstall.lib.installer import Installer from archinstall.lib.models import Bootloader -from archinstall.lib.models.device_model import ( - DiskLayoutConfiguration, -) -from archinstall.lib.models.network_configuration import NetworkConfiguration from archinstall.lib.models.profile_model import ProfileConfiguration from archinstall.lib.models.users import Password, User from archinstall.lib.output import debug, error, info @@ -20,13 +16,13 @@ def perform_installation(mountpoint: Path) -> None: - config: ArchConfig = arch_config_handler.config + config = arch_config_handler.config if not config.disk_config: error("No disk configuration provided") return - disk_config: DiskLayoutConfiguration = config.disk_config + disk_config = config.disk_config disk_encryption = config.disk_encryption with Installer( @@ -41,7 +37,7 @@ def perform_installation(mountpoint: Path) -> None: installation.set_hostname('minimal-arch') installation.add_bootloader(Bootloader.Systemd) - network_config: NetworkConfiguration | None = config.network_config + network_config = config.network_config if network_config: network_config.install_network_config( diff --git a/archinstall/scripts/only_hd.py b/archinstall/scripts/only_hd.py index c21343177f..05fa5b421b 100644 --- a/archinstall/scripts/only_hd.py +++ b/archinstall/scripts/only_hd.py @@ -1,15 +1,12 @@ from pathlib import Path from archinstall import debug, error -from archinstall.lib.args import ArchConfig, arch_config_handler +from archinstall.lib.args import arch_config_handler from archinstall.lib.configuration import ConfigurationOutput from archinstall.lib.disk.filesystem import FilesystemHandler from archinstall.lib.disk.utils import disk_layouts from archinstall.lib.global_menu import GlobalMenu from archinstall.lib.installer import Installer -from archinstall.lib.models.device_model import ( - DiskLayoutConfiguration, -) from archinstall.tui import Tui @@ -33,13 +30,13 @@ def perform_installation(mountpoint: Path) -> None: Only requirement is that the block devices are formatted and setup prior to entering this function. """ - config: ArchConfig = arch_config_handler.config + config = arch_config_handler.config if not config.disk_config: error("No disk configuration provided") return - disk_config: DiskLayoutConfiguration = config.disk_config + disk_config = config.disk_config disk_encryption = config.disk_encryption with Installer( diff --git a/examples/interactive_installation.py b/examples/interactive_installation.py index e3cc94922c..6bb42220dc 100644 --- a/examples/interactive_installation.py +++ b/examples/interactive_installation.py @@ -2,20 +2,18 @@ from pathlib import Path from archinstall import SysInfo, debug, error, info -from archinstall.lib.args import ArchConfig, arch_config_handler +from archinstall.lib.args import arch_config_handler from archinstall.lib.configuration import ConfigurationOutput from archinstall.lib.disk.filesystem import FilesystemHandler from archinstall.lib.disk.utils import disk_layouts from archinstall.lib.global_menu import GlobalMenu from archinstall.lib.installer import Installer, accessibility_tools_in_use, run_custom_user_commands from archinstall.lib.interactions.general_conf import PostInstallationAction, ask_post_installation -from archinstall.lib.models import AudioConfiguration, Bootloader +from archinstall.lib.models import Bootloader from archinstall.lib.models.device_model import ( - DiskLayoutConfiguration, DiskLayoutType, EncryptionType, ) -from archinstall.lib.models.network_configuration import NetworkConfiguration from archinstall.lib.models.users import User from archinstall.lib.profile.profiles_handler import profile_handler from archinstall.tui import Tui @@ -45,13 +43,13 @@ def perform_installation(mountpoint: Path) -> None: """ info('Starting installation...') - config: ArchConfig = arch_config_handler.config + config = arch_config_handler.config if not config.disk_config: error("No disk configuration provided") return - disk_config: DiskLayoutConfiguration = config.disk_config + disk_config = config.disk_config run_mkinitcpio = not config.uki locale_config = config.locale_config disk_encryption = config.disk_encryption @@ -97,7 +95,7 @@ def perform_installation(mountpoint: Path) -> None: # If user selected to copy the current ISO network configuration # Perform a copy of the config - network_config: NetworkConfiguration | None = config.network_config + network_config = config.network_config if network_config: network_config.install_network_config( @@ -108,7 +106,7 @@ def perform_installation(mountpoint: Path) -> None: if users := config.users: installation.create_users(users) - audio_config: AudioConfiguration | None = config.audio_config + audio_config = config.audio_config if audio_config: audio_config.install_audio_config(installation) else: diff --git a/examples/minimal_installation.py b/examples/minimal_installation.py index d648c6e393..ce115f04d0 100644 --- a/examples/minimal_installation.py +++ b/examples/minimal_installation.py @@ -1,15 +1,13 @@ from pathlib import Path from archinstall.default_profiles.minimal import MinimalProfile -from archinstall.lib.args import ArchConfig, arch_config_handler +from archinstall.lib.args import arch_config_handler from archinstall.lib.configuration import ConfigurationOutput from archinstall.lib.disk.disk_menu import DiskLayoutConfigurationMenu from archinstall.lib.disk.encryption_menu import DiskEncryptionMenu from archinstall.lib.disk.filesystem import FilesystemHandler from archinstall.lib.installer import Installer from archinstall.lib.models import Bootloader -from archinstall.lib.models.device_model import DiskLayoutConfiguration -from archinstall.lib.models.network_configuration import NetworkConfiguration from archinstall.lib.models.profile_model import ProfileConfiguration from archinstall.lib.models.users import Password, User from archinstall.lib.output import debug, error, info @@ -18,9 +16,9 @@ def perform_installation(mountpoint: Path) -> None: - config: ArchConfig = arch_config_handler.config + config = arch_config_handler.config - disk_config: DiskLayoutConfiguration | None = config.disk_config + disk_config = config.disk_config if disk_config is None: error("No disk configuration provided") @@ -40,7 +38,7 @@ def perform_installation(mountpoint: Path) -> None: installation.set_hostname('minimal-arch') installation.add_bootloader(Bootloader.Systemd) - network_config: NetworkConfiguration | None = config.network_config + network_config = config.network_config if network_config: network_config.install_network_config( diff --git a/examples/only_hd_installation.py b/examples/only_hd_installation.py index 18b946b20e..0556b1bba8 100644 --- a/examples/only_hd_installation.py +++ b/examples/only_hd_installation.py @@ -1,12 +1,11 @@ from pathlib import Path -from archinstall.lib.args import ArchConfig, arch_config_handler +from archinstall.lib.args import arch_config_handler from archinstall.lib.configuration import ConfigurationOutput from archinstall.lib.disk.filesystem import FilesystemHandler from archinstall.lib.disk.utils import disk_layouts from archinstall.lib.global_menu import GlobalMenu from archinstall.lib.installer import Installer -from archinstall.lib.models.device_model import DiskLayoutConfiguration from archinstall.lib.output import debug, error from archinstall.tui import Tui @@ -31,13 +30,13 @@ def perform_installation(mountpoint: Path) -> None: Only requirement is that the block devices are formatted and setup prior to entering this function. """ - config: ArchConfig = arch_config_handler.config + config = arch_config_handler.config if not config.disk_config: error("No disk configuration provided") return - disk_config: DiskLayoutConfiguration = config.disk_config + disk_config = config.disk_config disk_encryption = config.disk_encryption with Installer(