diff --git a/archinstall/lib/args.py b/archinstall/lib/args.py index 1f56d6bd..eb58ce8f 100644 --- a/archinstall/lib/args.py +++ b/archinstall/lib/args.py @@ -21,10 +21,10 @@ from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguratio from archinstall.lib.models.config import SubConfig from archinstall.lib.models.device import DiskEncryption, DiskLayoutConfiguration from archinstall.lib.models.locale import LocaleConfiguration -from archinstall.lib.models.mirrors import PacmanConfiguration from archinstall.lib.models.network import NetworkConfiguration from archinstall.lib.models.package_types import DEFAULT_KERNEL from archinstall.lib.models.packages import Repository +from archinstall.lib.models.pacman import PacmanConfiguration from archinstall.lib.models.profile import ProfileConfiguration from archinstall.lib.models.users import Password, User, UserSerialization from archinstall.lib.output import debug, error, logger, warn diff --git a/archinstall/lib/global_menu.py b/archinstall/lib/global_menu.py index dbad6fa1..c065d7a9 100644 --- a/archinstall/lib/global_menu.py +++ b/archinstall/lib/global_menu.py @@ -19,10 +19,10 @@ from archinstall.lib.models.authentication import AuthenticationConfiguration from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguration from archinstall.lib.models.device import DiskLayoutConfiguration, DiskLayoutType, PartitionModification from archinstall.lib.models.locale import LocaleConfiguration -from archinstall.lib.models.mirrors import PacmanConfiguration from archinstall.lib.models.network import NetworkConfiguration, NicType from archinstall.lib.models.package_types import DEFAULT_KERNEL from archinstall.lib.models.packages import Repository +from archinstall.lib.models.pacman import PacmanConfiguration from archinstall.lib.models.profile import ProfileConfiguration from archinstall.lib.network.network_menu import select_network from archinstall.lib.output import FormattedOutput diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 309cffa1..2b940af0 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -46,10 +46,10 @@ from archinstall.lib.models.device import ( Unit, ) from archinstall.lib.models.locale import LocaleConfiguration -from archinstall.lib.models.mirrors import PacmanConfiguration from archinstall.lib.models.network import Nic from archinstall.lib.models.package_types import DEFAULT_KERNEL, Kernel from archinstall.lib.models.packages import Repository +from archinstall.lib.models.pacman import PacmanConfiguration from archinstall.lib.models.users import User from archinstall.lib.output import debug, error, info, log, logger, warn from archinstall.lib.packages.packages import installed_package diff --git a/archinstall/lib/mirror/mirror_handler.py b/archinstall/lib/mirror/mirror_handler.py index ef0ba1a9..c1a2ea68 100644 --- a/archinstall/lib/mirror/mirror_handler.py +++ b/archinstall/lib/mirror/mirror_handler.py @@ -3,7 +3,7 @@ import urllib.parse from pathlib import Path from archinstall.lib.models import MirrorRegion -from archinstall.lib.models.mirrors import MirrorStatusEntryV3, MirrorStatusListV3 +from archinstall.lib.models.pacman import MirrorStatusEntryV3, MirrorStatusListV3 from archinstall.lib.networking import fetch_data_from_url from archinstall.lib.output import debug, info from archinstall.lib.pathnames import MIRRORLIST diff --git a/archinstall/lib/models/__init__.py b/archinstall/lib/models/__init__.py index 156f21ac..7e8e0f2d 100644 --- a/archinstall/lib/models/__init__.py +++ b/archinstall/lib/models/__init__.py @@ -27,9 +27,9 @@ from archinstall.lib.models.device import ( _DeviceInfo, ) from archinstall.lib.models.locale import LocaleConfiguration -from archinstall.lib.models.mirrors import CustomRepository, MirrorRegion, PacmanConfiguration from archinstall.lib.models.network import NetworkConfiguration, Nic, NicType from archinstall.lib.models.packages import LocalPackage, PackageSearch, PackageSearchResult, Repository +from archinstall.lib.models.pacman import CustomRepository, MirrorRegion, PacmanConfiguration from archinstall.lib.models.profile import ProfileConfiguration from archinstall.lib.models.users import PasswordStrength, User diff --git a/archinstall/lib/models/mirrors.py b/archinstall/lib/models/pacman.py similarity index 100% rename from archinstall/lib/models/mirrors.py rename to archinstall/lib/models/pacman.py diff --git a/archinstall/lib/pacman/config.py b/archinstall/lib/pacman/config.py index f6619bf8..5785b319 100644 --- a/archinstall/lib/pacman/config.py +++ b/archinstall/lib/pacman/config.py @@ -1,8 +1,8 @@ import re from pathlib import Path -from archinstall.lib.models.mirrors import PacmanConfiguration from archinstall.lib.models.packages import Repository +from archinstall.lib.models.pacman import PacmanConfiguration from archinstall.lib.pathnames import PACMAN_CONF diff --git a/archinstall/lib/pacman/pacman_menu.py b/archinstall/lib/pacman/pacman_menu.py index a6ac7481..6939aa02 100644 --- a/archinstall/lib/pacman/pacman_menu.py +++ b/archinstall/lib/pacman/pacman_menu.py @@ -4,7 +4,8 @@ from archinstall.lib.menu.abstract_menu import AbstractSubMenu from archinstall.lib.menu.helpers import Confirmation, Input, Loading, Selection from archinstall.lib.menu.list_manager import ListManager from archinstall.lib.mirror.mirror_handler import MirrorListHandler -from archinstall.lib.models.mirrors import ( +from archinstall.lib.models.packages import Repository +from archinstall.lib.models.pacman import ( CustomRepository, CustomServer, MirrorRegion, @@ -12,7 +13,6 @@ from archinstall.lib.models.mirrors import ( SignCheck, SignOption, ) -from archinstall.lib.models.packages import Repository from archinstall.lib.output import FormattedOutput from archinstall.lib.pathnames import PACMAN_CONF from archinstall.lib.translationhandler import tr diff --git a/tests/test_args.py b/tests/test_args.py index e6cea437..f8d4b4a2 100644 --- a/tests/test_args.py +++ b/tests/test_args.py @@ -19,9 +19,9 @@ from archinstall.lib.models.authentication import AuthenticationConfiguration, U from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguration from archinstall.lib.models.device import DiskLayoutConfiguration, DiskLayoutType from archinstall.lib.models.locale import LocaleConfiguration -from archinstall.lib.models.mirrors import CustomRepository, CustomServer, MirrorRegion, PacmanConfiguration, SignCheck, SignOption from archinstall.lib.models.network import NetworkConfiguration, Nic, NicType from archinstall.lib.models.packages import Repository +from archinstall.lib.models.pacman import CustomRepository, CustomServer, MirrorRegion, PacmanConfiguration, SignCheck, SignOption from archinstall.lib.models.profile import ProfileConfiguration from archinstall.lib.models.users import Password, User from archinstall.lib.profile.profiles_handler import profile_handler