From 8d807c08ee7e77b2dc64fb9210320e3058aad661 Mon Sep 17 00:00:00 2001 From: correctmost <134317971+correctmost@users.noreply.github.com> Date: Mon, 25 Nov 2024 02:49:22 -0500 Subject: [PATCH] Use precise type hints for most DeferredTranslation references (#2929) The remaining "_: Any" instances will require accompanying code changes. --- archinstall/__init__.py | 4 +++- archinstall/default_profiles/desktop.py | 8 ++++++-- archinstall/default_profiles/desktops/hyprland.py | 8 ++++++-- archinstall/default_profiles/desktops/sway.py | 8 ++++++-- archinstall/default_profiles/minimal.py | 8 ++++++-- archinstall/default_profiles/profile.py | 7 ++++++- archinstall/default_profiles/server.py | 8 ++++++-- archinstall/default_profiles/xorg.py | 8 ++++++-- archinstall/lib/configuration.py | 6 +++++- archinstall/lib/disk/device_model.py | 6 +++++- archinstall/lib/disk/disk_menu.py | 6 +++++- archinstall/lib/disk/encryption_menu.py | 6 +++++- archinstall/lib/disk/filesystem.py | 8 ++++++-- archinstall/lib/disk/partitioning_menu.py | 8 ++++++-- archinstall/lib/disk/subvolume_menu.py | 8 ++++++-- archinstall/lib/global_menu.py | 6 +++++- archinstall/lib/hardware.py | 8 ++++++-- archinstall/lib/interactions/disk_conf.py | 6 +++++- archinstall/lib/interactions/general_conf.py | 8 ++++++-- archinstall/lib/interactions/manage_users_conf.py | 8 ++++++-- archinstall/lib/interactions/network_menu.py | 8 ++++++-- archinstall/lib/interactions/system_conf.py | 8 ++++++-- archinstall/lib/locale/locale_menu.py | 6 +++++- archinstall/lib/menu/abstract_menu.py | 4 +++- archinstall/lib/menu/list_manager.py | 6 +++++- archinstall/lib/mirrors.py | 6 +++++- archinstall/lib/models/network_configuration.py | 6 +++++- archinstall/lib/models/users.py | 6 +++++- archinstall/lib/profile/profile_menu.py | 6 +++++- archinstall/lib/profile/profiles_handler.py | 7 ++++++- archinstall/lib/utils/util.py | 8 ++++++-- archinstall/scripts/swiss.py | 6 +++++- archinstall/tui/curses_menu.py | 4 +++- archinstall/tui/menu_item.py | 4 +++- pyproject.toml | 6 +++--- 35 files changed, 182 insertions(+), 52 deletions(-) diff --git a/archinstall/__init__.py b/archinstall/__init__.py index 2a12fd89..8afa2939 100644 --- a/archinstall/__init__.py +++ b/archinstall/__init__.py @@ -36,7 +36,9 @@ from .lib.translationhandler import DeferredTranslation, Language, TranslationHa from .tui import Tui if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + _: Callable[[str], DeferredTranslation] __version__ = "3.0.1" diff --git a/archinstall/default_profiles/desktop.py b/archinstall/default_profiles/desktop.py index aa34a644..15b94c33 100644 --- a/archinstall/default_profiles/desktop.py +++ b/archinstall/default_profiles/desktop.py @@ -1,4 +1,4 @@ -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from archinstall.default_profiles.profile import GreeterType, Profile, ProfileType, SelectResult from archinstall.lib.output import info @@ -6,8 +6,12 @@ from archinstall.lib.profile.profiles_handler import profile_handler from archinstall.tui import FrameProperties, MenuItem, MenuItemGroup, PreviewStyle, ResultType, SelectMenu if TYPE_CHECKING: + from collections.abc import Callable + from archinstall.lib.installer import Installer - _: Any + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class DesktopProfile(Profile): diff --git a/archinstall/default_profiles/desktops/hyprland.py b/archinstall/default_profiles/desktops/hyprland.py index 5df6b89c..9b07f773 100644 --- a/archinstall/default_profiles/desktops/hyprland.py +++ b/archinstall/default_profiles/desktops/hyprland.py @@ -1,4 +1,4 @@ -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from archinstall.default_profiles.desktops import SeatAccess from archinstall.default_profiles.profile import GreeterType, ProfileType, SelectResult @@ -6,8 +6,12 @@ from archinstall.default_profiles.xorg import XorgProfile from archinstall.tui import Alignment, FrameProperties, MenuItem, MenuItemGroup, ResultType, SelectMenu if TYPE_CHECKING: + from collections.abc import Callable + from archinstall.lib.installer import Installer - _: Any + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class HyprlandProfile(XorgProfile): diff --git a/archinstall/default_profiles/desktops/sway.py b/archinstall/default_profiles/desktops/sway.py index 774160d6..30d5def2 100644 --- a/archinstall/default_profiles/desktops/sway.py +++ b/archinstall/default_profiles/desktops/sway.py @@ -1,4 +1,4 @@ -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from archinstall.default_profiles.desktops import SeatAccess from archinstall.default_profiles.profile import GreeterType, ProfileType, SelectResult @@ -6,8 +6,12 @@ from archinstall.default_profiles.xorg import XorgProfile from archinstall.tui import Alignment, FrameProperties, MenuItem, MenuItemGroup, ResultType, SelectMenu if TYPE_CHECKING: + from collections.abc import Callable + from archinstall.lib.installer import Installer - _: Any + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class SwayProfile(XorgProfile): diff --git a/archinstall/default_profiles/minimal.py b/archinstall/default_profiles/minimal.py index 55b6714f..a54327b7 100644 --- a/archinstall/default_profiles/minimal.py +++ b/archinstall/default_profiles/minimal.py @@ -1,9 +1,13 @@ -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from archinstall.default_profiles.profile import Profile, ProfileType if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class MinimalProfile(Profile): diff --git a/archinstall/default_profiles/profile.py b/archinstall/default_profiles/profile.py index 87c1762f..cd88f873 100644 --- a/archinstall/default_profiles/profile.py +++ b/archinstall/default_profiles/profile.py @@ -7,8 +7,13 @@ from typing import TYPE_CHECKING, Any from ..lib.storage import storage if TYPE_CHECKING: + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + from ..lib.installer import Installer - _: Any + + _: Callable[[str], DeferredTranslation] class ProfileType(Enum): diff --git a/archinstall/default_profiles/server.py b/archinstall/default_profiles/server.py index 38defdc6..cd35b19e 100644 --- a/archinstall/default_profiles/server.py +++ b/archinstall/default_profiles/server.py @@ -1,4 +1,4 @@ -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from archinstall.default_profiles.profile import Profile, ProfileType, SelectResult from archinstall.lib.output import info @@ -6,8 +6,12 @@ from archinstall.lib.profile.profiles_handler import profile_handler from archinstall.tui import FrameProperties, MenuItem, MenuItemGroup, PreviewStyle, ResultType, SelectMenu if TYPE_CHECKING: + from collections.abc import Callable + from archinstall.lib.installer import Installer - _: Any + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class ServerProfile(Profile): diff --git a/archinstall/default_profiles/xorg.py b/archinstall/default_profiles/xorg.py index b661c9e3..86dd22e0 100644 --- a/archinstall/default_profiles/xorg.py +++ b/archinstall/default_profiles/xorg.py @@ -1,9 +1,13 @@ -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from archinstall.default_profiles.profile import Profile, ProfileType if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class XorgProfile(Profile): diff --git a/archinstall/lib/configuration.py b/archinstall/lib/configuration.py index 4c9bed2e..55fd30a4 100644 --- a/archinstall/lib/configuration.py +++ b/archinstall/lib/configuration.py @@ -13,7 +13,11 @@ from .storage import storage from .utils.util import prompt_dir if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class ConfigurationOutput: diff --git a/archinstall/lib/disk/device_model.py b/archinstall/lib/disk/device_model.py index e84cbd5f..d8872028 100644 --- a/archinstall/lib/disk/device_model.py +++ b/archinstall/lib/disk/device_model.py @@ -17,7 +17,11 @@ from ..output import debug from ..storage import storage if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class DiskLayoutType(Enum): diff --git a/archinstall/lib/disk/disk_menu.py b/archinstall/lib/disk/disk_menu.py index 78c8ff58..c37c1512 100644 --- a/archinstall/lib/disk/disk_menu.py +++ b/archinstall/lib/disk/disk_menu.py @@ -11,7 +11,11 @@ from . import DiskLayoutConfiguration, DiskLayoutType from .device_model import LvmConfiguration if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class DiskLayoutConfigurationMenu(AbstractSubMenu): diff --git a/archinstall/lib/disk/encryption_menu.py b/archinstall/lib/disk/encryption_menu.py index c611ed50..08d26fd1 100644 --- a/archinstall/lib/disk/encryption_menu.py +++ b/archinstall/lib/disk/encryption_menu.py @@ -12,7 +12,11 @@ from . import LvmConfiguration, LvmVolume from .fido import Fido2, Fido2Device if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class DiskEncryptionMenu(AbstractSubMenu): diff --git a/archinstall/lib/disk/filesystem.py b/archinstall/lib/disk/filesystem.py index 3ef92cd1..9f906e58 100644 --- a/archinstall/lib/disk/filesystem.py +++ b/archinstall/lib/disk/filesystem.py @@ -2,7 +2,7 @@ from __future__ import annotations import time from pathlib import Path -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from archinstall.tui import Tui @@ -28,7 +28,11 @@ from .device_model import ( ) if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class FilesystemHandler: diff --git a/archinstall/lib/disk/partitioning_menu.py b/archinstall/lib/disk/partitioning_menu.py index 9d4913c7..d8ba8591 100644 --- a/archinstall/lib/disk/partitioning_menu.py +++ b/archinstall/lib/disk/partitioning_menu.py @@ -3,7 +3,7 @@ from __future__ import annotations import re from dataclasses import dataclass from pathlib import Path -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from archinstall.tui import Alignment, EditMenu, FrameProperties, MenuItem, MenuItemGroup, Orientation, ResultType, SelectMenu @@ -27,7 +27,11 @@ from .device_model import ( from .subvolume_menu import SubvolumeMenu if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] @dataclass diff --git a/archinstall/lib/disk/subvolume_menu.py b/archinstall/lib/disk/subvolume_menu.py index f5b3034f..5ebe5170 100644 --- a/archinstall/lib/disk/subvolume_menu.py +++ b/archinstall/lib/disk/subvolume_menu.py @@ -1,5 +1,5 @@ from pathlib import Path -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from archinstall.tui import Alignment, EditMenu, ResultType @@ -8,7 +8,11 @@ from ..utils.util import prompt_dir from .device_model import SubvolumeModification if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class SubvolumeMenu(ListManager): diff --git a/archinstall/lib/global_menu.py b/archinstall/lib/global_menu.py index b4fa8a68..36e8e40b 100644 --- a/archinstall/lib/global_menu.py +++ b/archinstall/lib/global_menu.py @@ -36,7 +36,11 @@ from .translationhandler import Language, TranslationHandler from .utils.util import format_cols, get_password if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class GlobalMenu(AbstractMenu): diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py index 7249f2d7..f5c2a553 100644 --- a/archinstall/lib/hardware.py +++ b/archinstall/lib/hardware.py @@ -2,7 +2,7 @@ import os from enum import Enum from functools import cached_property from pathlib import Path -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from .exceptions import SysCallError from .general import SysCommand @@ -10,7 +10,11 @@ from .networking import enrich_iface_types, list_interfaces from .output import debug if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class CpuVendor(Enum): diff --git a/archinstall/lib/interactions/disk_conf.py b/archinstall/lib/interactions/disk_conf.py index 5ca482df..c6b1cd28 100644 --- a/archinstall/lib/interactions/disk_conf.py +++ b/archinstall/lib/interactions/disk_conf.py @@ -14,7 +14,11 @@ from ..storage import storage from ..utils.util import prompt_dir if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] def select_devices(preset: list[disk.BDevice] | None = []) -> list[disk.BDevice]: diff --git a/archinstall/lib/interactions/general_conf.py b/archinstall/lib/interactions/general_conf.py index 1264bc7c..340ede87 100644 --- a/archinstall/lib/interactions/general_conf.py +++ b/archinstall/lib/interactions/general_conf.py @@ -1,7 +1,7 @@ from __future__ import annotations import pathlib -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from archinstall.tui import Alignment, EditMenu, FrameProperties, MenuItem, MenuItemGroup, Orientation, ResultType, SelectMenu, Tui @@ -13,7 +13,11 @@ from ..storage import storage from ..translationhandler import Language if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] def ask_ntp(preset: bool = True) -> bool: diff --git a/archinstall/lib/interactions/manage_users_conf.py b/archinstall/lib/interactions/manage_users_conf.py index c93e8c58..4db3eaf5 100644 --- a/archinstall/lib/interactions/manage_users_conf.py +++ b/archinstall/lib/interactions/manage_users_conf.py @@ -1,7 +1,7 @@ from __future__ import annotations import re -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from archinstall.tui import Alignment, EditMenu, MenuItem, MenuItemGroup, Orientation, ResultType, SelectMenu @@ -11,7 +11,11 @@ from ..models.users import User from ..utils.util import get_password if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class UserList(ListManager): diff --git a/archinstall/lib/interactions/network_menu.py b/archinstall/lib/interactions/network_menu.py index 0c8528e7..ec1bde78 100644 --- a/archinstall/lib/interactions/network_menu.py +++ b/archinstall/lib/interactions/network_menu.py @@ -1,7 +1,7 @@ from __future__ import annotations import ipaddress -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from archinstall.tui import Alignment, EditMenu, FrameProperties, MenuItem, MenuItemGroup, ResultType, SelectMenu @@ -10,7 +10,11 @@ from ..models.network_configuration import NetworkConfiguration, Nic, NicType from ..networking import list_interfaces if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class ManualNetworkConfig(ListManager): diff --git a/archinstall/lib/interactions/system_conf.py b/archinstall/lib/interactions/system_conf.py index f6be36fd..f2a64abf 100644 --- a/archinstall/lib/interactions/system_conf.py +++ b/archinstall/lib/interactions/system_conf.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from archinstall.tui import Alignment, FrameProperties, FrameStyle, MenuItem, MenuItemGroup, Orientation, PreviewStyle, ResultType, SelectMenu @@ -8,7 +8,11 @@ from ..hardware import GfxDriver, SysInfo from ..models.bootloader import Bootloader if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] def select_kernel(preset: list[str] = []) -> list[str]: diff --git a/archinstall/lib/locale/locale_menu.py b/archinstall/lib/locale/locale_menu.py index ede1d793..5b11fb08 100644 --- a/archinstall/lib/locale/locale_menu.py +++ b/archinstall/lib/locale/locale_menu.py @@ -7,7 +7,11 @@ from ..menu import AbstractSubMenu from .utils import get_kb_layout, list_keyboard_languages, list_locales, set_kb_layout if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] @dataclass diff --git a/archinstall/lib/menu/abstract_menu.py b/archinstall/lib/menu/abstract_menu.py index 49c4cbc0..4409df9b 100644 --- a/archinstall/lib/menu/abstract_menu.py +++ b/archinstall/lib/menu/abstract_menu.py @@ -8,7 +8,9 @@ from archinstall.tui import Chars, FrameProperties, FrameStyle, MenuItem, MenuIt from ..output import error, unicode_ljust if TYPE_CHECKING: - _: Any + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class Selector: diff --git a/archinstall/lib/menu/list_manager.py b/archinstall/lib/menu/list_manager.py index 2addb5e6..ad74dced 100644 --- a/archinstall/lib/menu/list_manager.py +++ b/archinstall/lib/menu/list_manager.py @@ -6,7 +6,11 @@ from archinstall.tui import Alignment, MenuItem, MenuItemGroup, ResultType, Sele from ..output import FormattedOutput if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class ListManager: diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py index 42f65cbd..79b689ae 100644 --- a/archinstall/lib/mirrors.py +++ b/archinstall/lib/mirrors.py @@ -15,7 +15,11 @@ from .output import FormattedOutput, debug from .storage import storage if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class SignCheck(Enum): diff --git a/archinstall/lib/models/network_configuration.py b/archinstall/lib/models/network_configuration.py index 41487eb7..2c4cc432 100644 --- a/archinstall/lib/models/network_configuration.py +++ b/archinstall/lib/models/network_configuration.py @@ -7,7 +7,11 @@ from typing import TYPE_CHECKING, Any from ..profile import ProfileConfiguration if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class NicType(Enum): diff --git a/archinstall/lib/models/users.py b/archinstall/lib/models/users.py index e9020fc6..6e9442f8 100644 --- a/archinstall/lib/models/users.py +++ b/archinstall/lib/models/users.py @@ -3,7 +3,11 @@ from enum import Enum from typing import TYPE_CHECKING, Any if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class PasswordStrength(Enum): diff --git a/archinstall/lib/profile/profile_menu.py b/archinstall/lib/profile/profile_menu.py index b83c04e3..c948d464 100644 --- a/archinstall/lib/profile/profile_menu.py +++ b/archinstall/lib/profile/profile_menu.py @@ -11,7 +11,11 @@ from ..menu import AbstractSubMenu from .profile_model import ProfileConfiguration if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class ProfileMenu(AbstractSubMenu): diff --git a/archinstall/lib/profile/profiles_handler.py b/archinstall/lib/profile/profiles_handler.py index db6cd803..0851a627 100644 --- a/archinstall/lib/profile/profiles_handler.py +++ b/archinstall/lib/profile/profiles_handler.py @@ -18,8 +18,13 @@ from ..storage import storage from .profile_model import ProfileConfiguration if TYPE_CHECKING: + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + from ..installer import Installer - _: Any + + _: Callable[[str], DeferredTranslation] class ProfileHandler: diff --git a/archinstall/lib/utils/util.py b/archinstall/lib/utils/util.py index 20075490..79fe47f0 100644 --- a/archinstall/lib/utils/util.py +++ b/archinstall/lib/utils/util.py @@ -1,5 +1,5 @@ from pathlib import Path -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING from archinstall.tui import Alignment, EditMenu @@ -7,7 +7,11 @@ from ..general import secret from ..output import FormattedOutput if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] def get_password( diff --git a/archinstall/scripts/swiss.py b/archinstall/scripts/swiss.py index e4e7c1ab..d79a408b 100644 --- a/archinstall/scripts/swiss.py +++ b/archinstall/scripts/swiss.py @@ -14,7 +14,11 @@ from archinstall.lib.profile.profiles_handler import profile_handler from archinstall.tui import Alignment, FrameProperties, MenuItem, MenuItemGroup, ResultType, SelectMenu, Tui if TYPE_CHECKING: - _: Any + from collections.abc import Callable + + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class ExecutionMode(Enum): diff --git a/archinstall/tui/curses_menu.py b/archinstall/tui/curses_menu.py index e9b8b713..c6f6fcd8 100644 --- a/archinstall/tui/curses_menu.py +++ b/archinstall/tui/curses_menu.py @@ -34,7 +34,9 @@ from .types import ( ) if TYPE_CHECKING: - _: Any + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] class AbstractCurses(metaclass=ABCMeta): diff --git a/archinstall/tui/menu_item.py b/archinstall/tui/menu_item.py index 8a7d8d31..7e6dcce4 100644 --- a/archinstall/tui/menu_item.py +++ b/archinstall/tui/menu_item.py @@ -7,7 +7,9 @@ from typing import TYPE_CHECKING, Any, ClassVar from ..lib.output import unicode_ljust if TYPE_CHECKING: - _: Any + from archinstall.lib.translationhandler import DeferredTranslation + + _: Callable[[str], DeferredTranslation] @dataclass diff --git a/pyproject.toml b/pyproject.toml index e7655ea1..f8f0fa6a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -86,12 +86,12 @@ warn_unused_configs = true warn_unused_ignores = true [[tool.mypy.overrides]] -module = "archinstall.default_profiles.applications.*" +module = "archinstall.default_profiles.*" disallow_any_explicit = true [[tool.mypy.overrides]] -module = "archinstall.default_profiles.servers.*" -disallow_any_explicit = true +module = "archinstall.default_profiles.profile" +disallow_any_explicit = false [[tool.mypy.overrides]] module = "archinstall.examples.*"