From 0aa6dcc78ed90c711330f69657841c34f8e6c4a8 Mon Sep 17 00:00:00 2001 From: correctmost <134317971+correctmost@users.noreply.github.com> Date: Mon, 18 Nov 2024 15:54:17 -0500 Subject: [PATCH] Sort and format imports in examples/ and default_profiles/ (#2873) --- archinstall/default_profiles/applications/pipewire.py | 3 +-- archinstall/default_profiles/desktop.py | 10 +++------- archinstall/default_profiles/desktops/awesome.py | 2 +- archinstall/default_profiles/desktops/bspwm.py | 4 ++-- archinstall/default_profiles/desktops/budgie.py | 4 ++-- archinstall/default_profiles/desktops/cinnamon.py | 4 ++-- archinstall/default_profiles/desktops/cosmic.py | 4 ++-- archinstall/default_profiles/desktops/cutefish.py | 4 ++-- archinstall/default_profiles/desktops/deepin.py | 4 ++-- .../default_profiles/desktops/enlightenment.py | 4 ++-- archinstall/default_profiles/desktops/gnome.py | 4 ++-- archinstall/default_profiles/desktops/hyprland.py | 7 ++----- archinstall/default_profiles/desktops/i3.py | 4 ++-- archinstall/default_profiles/desktops/lxqt.py | 4 ++-- archinstall/default_profiles/desktops/mate.py | 4 ++-- archinstall/default_profiles/desktops/plasma.py | 4 ++-- archinstall/default_profiles/desktops/qtile.py | 4 ++-- archinstall/default_profiles/desktops/sway.py | 8 ++------ archinstall/default_profiles/desktops/xfce4.py | 4 ++-- archinstall/default_profiles/minimal.py | 2 +- archinstall/default_profiles/profile.py | 2 +- archinstall/default_profiles/server.py | 10 +++------- archinstall/default_profiles/servers/docker.py | 1 - archinstall/default_profiles/tailored.py | 2 +- archinstall/default_profiles/xorg.py | 2 +- examples/full_automated_installation.py | 6 +----- examples/interactive_installation.py | 11 ++++------- examples/mac_address_installation.py | 3 +-- examples/minimal_installation.py | 8 +++----- examples/only_hd_installation.py | 4 ++-- 30 files changed, 55 insertions(+), 82 deletions(-) diff --git a/archinstall/default_profiles/applications/pipewire.py b/archinstall/default_profiles/applications/pipewire.py index fd210fb2..4c731e6d 100644 --- a/archinstall/default_profiles/applications/pipewire.py +++ b/archinstall/default_profiles/applications/pipewire.py @@ -1,7 +1,6 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any import archinstall - from archinstall.default_profiles.profile import Profile, ProfileType from archinstall.lib.models import User diff --git a/archinstall/default_profiles/desktop.py b/archinstall/default_profiles/desktop.py index bd7430a7..aa34a644 100644 --- a/archinstall/default_profiles/desktop.py +++ b/archinstall/default_profiles/desktop.py @@ -1,13 +1,9 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any +from archinstall.default_profiles.profile import GreeterType, Profile, ProfileType, SelectResult from archinstall.lib.output import info from archinstall.lib.profile.profiles_handler import profile_handler -from archinstall.default_profiles.profile import Profile, ProfileType, SelectResult, GreeterType - -from archinstall.tui import ( - MenuItemGroup, MenuItem, SelectMenu, - FrameProperties, ResultType, PreviewStyle -) +from archinstall.tui import FrameProperties, MenuItem, MenuItemGroup, PreviewStyle, ResultType, SelectMenu if TYPE_CHECKING: from archinstall.lib.installer import Installer diff --git a/archinstall/default_profiles/desktops/awesome.py b/archinstall/default_profiles/desktops/awesome.py index 5e328135..55f47139 100644 --- a/archinstall/default_profiles/desktops/awesome.py +++ b/archinstall/default_profiles/desktops/awesome.py @@ -1,4 +1,4 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any from archinstall.default_profiles.profile import ProfileType from archinstall.default_profiles.xorg import XorgProfile diff --git a/archinstall/default_profiles/desktops/bspwm.py b/archinstall/default_profiles/desktops/bspwm.py index 786c7b29..e0107408 100644 --- a/archinstall/default_profiles/desktops/bspwm.py +++ b/archinstall/default_profiles/desktops/bspwm.py @@ -1,6 +1,6 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile if TYPE_CHECKING: diff --git a/archinstall/default_profiles/desktops/budgie.py b/archinstall/default_profiles/desktops/budgie.py index d10cc762..cb194bd3 100644 --- a/archinstall/default_profiles/desktops/budgie.py +++ b/archinstall/default_profiles/desktops/budgie.py @@ -1,6 +1,6 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile if TYPE_CHECKING: diff --git a/archinstall/default_profiles/desktops/cinnamon.py b/archinstall/default_profiles/desktops/cinnamon.py index c8179001..ab35aee0 100644 --- a/archinstall/default_profiles/desktops/cinnamon.py +++ b/archinstall/default_profiles/desktops/cinnamon.py @@ -1,6 +1,6 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile if TYPE_CHECKING: diff --git a/archinstall/default_profiles/desktops/cosmic.py b/archinstall/default_profiles/desktops/cosmic.py index 5ab6e19e..d40853ef 100644 --- a/archinstall/default_profiles/desktops/cosmic.py +++ b/archinstall/default_profiles/desktops/cosmic.py @@ -1,6 +1,6 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile if TYPE_CHECKING: diff --git a/archinstall/default_profiles/desktops/cutefish.py b/archinstall/default_profiles/desktops/cutefish.py index 22d72082..e7f7ac71 100644 --- a/archinstall/default_profiles/desktops/cutefish.py +++ b/archinstall/default_profiles/desktops/cutefish.py @@ -1,6 +1,6 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile if TYPE_CHECKING: diff --git a/archinstall/default_profiles/desktops/deepin.py b/archinstall/default_profiles/desktops/deepin.py index c40fb1d3..8c5ffd2f 100644 --- a/archinstall/default_profiles/desktops/deepin.py +++ b/archinstall/default_profiles/desktops/deepin.py @@ -1,6 +1,6 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile if TYPE_CHECKING: diff --git a/archinstall/default_profiles/desktops/enlightenment.py b/archinstall/default_profiles/desktops/enlightenment.py index a5b55c91..8588106e 100644 --- a/archinstall/default_profiles/desktops/enlightenment.py +++ b/archinstall/default_profiles/desktops/enlightenment.py @@ -1,6 +1,6 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile if TYPE_CHECKING: diff --git a/archinstall/default_profiles/desktops/gnome.py b/archinstall/default_profiles/desktops/gnome.py index 4431119b..c549e0ab 100644 --- a/archinstall/default_profiles/desktops/gnome.py +++ b/archinstall/default_profiles/desktops/gnome.py @@ -1,6 +1,6 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile if TYPE_CHECKING: diff --git a/archinstall/default_profiles/desktops/hyprland.py b/archinstall/default_profiles/desktops/hyprland.py index 7e10c57a..174172ba 100644 --- a/archinstall/default_profiles/desktops/hyprland.py +++ b/archinstall/default_profiles/desktops/hyprland.py @@ -1,12 +1,9 @@ from enum import Enum from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType, SelectResult +from archinstall.default_profiles.profile import GreeterType, ProfileType, SelectResult from archinstall.default_profiles.xorg import XorgProfile -from archinstall.tui import ( - MenuItemGroup, MenuItem, SelectMenu, - FrameProperties, ResultType, Alignment -) +from archinstall.tui import Alignment, FrameProperties, MenuItem, MenuItemGroup, ResultType, SelectMenu if TYPE_CHECKING: from archinstall.lib.installer import Installer diff --git a/archinstall/default_profiles/desktops/i3.py b/archinstall/default_profiles/desktops/i3.py index 19d8acc1..483a86c2 100644 --- a/archinstall/default_profiles/desktops/i3.py +++ b/archinstall/default_profiles/desktops/i3.py @@ -1,6 +1,6 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile if TYPE_CHECKING: diff --git a/archinstall/default_profiles/desktops/lxqt.py b/archinstall/default_profiles/desktops/lxqt.py index fcdc84fe..a508b309 100644 --- a/archinstall/default_profiles/desktops/lxqt.py +++ b/archinstall/default_profiles/desktops/lxqt.py @@ -1,6 +1,6 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile if TYPE_CHECKING: diff --git a/archinstall/default_profiles/desktops/mate.py b/archinstall/default_profiles/desktops/mate.py index 22869021..15e01a12 100644 --- a/archinstall/default_profiles/desktops/mate.py +++ b/archinstall/default_profiles/desktops/mate.py @@ -1,6 +1,6 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile if TYPE_CHECKING: diff --git a/archinstall/default_profiles/desktops/plasma.py b/archinstall/default_profiles/desktops/plasma.py index d16b5655..f930beab 100644 --- a/archinstall/default_profiles/desktops/plasma.py +++ b/archinstall/default_profiles/desktops/plasma.py @@ -1,6 +1,6 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile if TYPE_CHECKING: diff --git a/archinstall/default_profiles/desktops/qtile.py b/archinstall/default_profiles/desktops/qtile.py index ec0c8b0f..a500bc76 100644 --- a/archinstall/default_profiles/desktops/qtile.py +++ b/archinstall/default_profiles/desktops/qtile.py @@ -1,6 +1,6 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile if TYPE_CHECKING: diff --git a/archinstall/default_profiles/desktops/sway.py b/archinstall/default_profiles/desktops/sway.py index 59c6ac2e..21a9db43 100644 --- a/archinstall/default_profiles/desktops/sway.py +++ b/archinstall/default_profiles/desktops/sway.py @@ -1,13 +1,9 @@ from enum import Enum from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType, SelectResult +from archinstall.default_profiles.profile import GreeterType, ProfileType, SelectResult from archinstall.default_profiles.xorg import XorgProfile - -from archinstall.tui import ( - MenuItemGroup, MenuItem, SelectMenu, - FrameProperties, Alignment, ResultType -) +from archinstall.tui import Alignment, FrameProperties, MenuItem, MenuItemGroup, ResultType, SelectMenu if TYPE_CHECKING: from archinstall.lib.installer import Installer diff --git a/archinstall/default_profiles/desktops/xfce4.py b/archinstall/default_profiles/desktops/xfce4.py index e07956fa..90d3bf51 100644 --- a/archinstall/default_profiles/desktops/xfce4.py +++ b/archinstall/default_profiles/desktops/xfce4.py @@ -1,6 +1,6 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any -from archinstall.default_profiles.profile import ProfileType, GreeterType +from archinstall.default_profiles.profile import GreeterType, ProfileType from archinstall.default_profiles.xorg import XorgProfile if TYPE_CHECKING: diff --git a/archinstall/default_profiles/minimal.py b/archinstall/default_profiles/minimal.py index 4614e577..55b6714f 100644 --- a/archinstall/default_profiles/minimal.py +++ b/archinstall/default_profiles/minimal.py @@ -1,4 +1,4 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any from archinstall.default_profiles.profile import Profile, ProfileType diff --git a/archinstall/default_profiles/profile.py b/archinstall/default_profiles/profile.py index 37858799..87c1762f 100644 --- a/archinstall/default_profiles/profile.py +++ b/archinstall/default_profiles/profile.py @@ -2,7 +2,7 @@ from __future__ import annotations import sys from enum import Enum, auto -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any from ..lib.storage import storage diff --git a/archinstall/default_profiles/server.py b/archinstall/default_profiles/server.py index f471ffe8..38defdc6 100644 --- a/archinstall/default_profiles/server.py +++ b/archinstall/default_profiles/server.py @@ -1,13 +1,9 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any +from archinstall.default_profiles.profile import Profile, ProfileType, SelectResult from archinstall.lib.output import info from archinstall.lib.profile.profiles_handler import profile_handler -from archinstall.default_profiles.profile import ProfileType, Profile, SelectResult - -from archinstall.tui import ( - MenuItemGroup, MenuItem, SelectMenu, - FrameProperties, ResultType, PreviewStyle -) +from archinstall.tui import FrameProperties, MenuItem, MenuItemGroup, PreviewStyle, ResultType, SelectMenu if TYPE_CHECKING: from archinstall.lib.installer import Installer diff --git a/archinstall/default_profiles/servers/docker.py b/archinstall/default_profiles/servers/docker.py index 901d8466..644aee82 100644 --- a/archinstall/default_profiles/servers/docker.py +++ b/archinstall/default_profiles/servers/docker.py @@ -1,7 +1,6 @@ from typing import TYPE_CHECKING import archinstall - from archinstall.default_profiles.profile import Profile, ProfileType from archinstall.lib.models import User diff --git a/archinstall/default_profiles/tailored.py b/archinstall/default_profiles/tailored.py index 7e446ea6..6b5aa2bc 100644 --- a/archinstall/default_profiles/tailored.py +++ b/archinstall/default_profiles/tailored.py @@ -1,4 +1,4 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any from archinstall.default_profiles.profile import ProfileType from archinstall.default_profiles.xorg import XorgProfile diff --git a/archinstall/default_profiles/xorg.py b/archinstall/default_profiles/xorg.py index e6162868..b661c9e3 100644 --- a/archinstall/default_profiles/xorg.py +++ b/archinstall/default_profiles/xorg.py @@ -1,4 +1,4 @@ -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any from archinstall.default_profiles.profile import Profile, ProfileType diff --git a/examples/full_automated_installation.py b/examples/full_automated_installation.py index 0108babe..38619f95 100644 --- a/examples/full_automated_installation.py +++ b/examples/full_automated_installation.py @@ -1,11 +1,7 @@ from pathlib import Path -from archinstall import Installer -from archinstall import profile +from archinstall import Installer, disk, models, profile from archinstall.default_profiles.minimal import MinimalProfile -from archinstall import disk -from archinstall import models - # we're creating a new ext4 filesystem installation fs_type = disk.FilesystemType('ext4') diff --git a/examples/interactive_installation.py b/examples/interactive_installation.py index 40bbd3a1..b4fc96b1 100644 --- a/examples/interactive_installation.py +++ b/examples/interactive_installation.py @@ -1,20 +1,17 @@ from pathlib import Path import archinstall -from archinstall import info, debug -from archinstall import SysInfo -from archinstall.lib import locale -from archinstall.lib import disk -from archinstall.lib.global_menu import GlobalMenu +from archinstall import SysInfo, debug, info +from archinstall.lib import disk, locale from archinstall.lib.configuration import ConfigurationOutput +from archinstall.lib.global_menu import GlobalMenu from archinstall.lib.installer import Installer +from archinstall.lib.interactions.general_conf import ask_chroot from archinstall.lib.models import AudioConfiguration, Bootloader from archinstall.lib.models.network_configuration import NetworkConfiguration from archinstall.lib.profile.profiles_handler import profile_handler -from archinstall.lib.interactions.general_conf import ask_chroot from archinstall.tui import Tui - if archinstall.arguments.get('help'): print("See `man archinstall` for help.") exit(0) diff --git a/examples/mac_address_installation.py b/examples/mac_address_installation.py index ed999b34..afa6f457 100644 --- a/examples/mac_address_installation.py +++ b/examples/mac_address_installation.py @@ -1,10 +1,9 @@ import time import archinstall -from archinstall import profile, info +from archinstall import info, profile from archinstall.tui import Tui - for _profile in profile.profile_handler.get_mac_addr_profiles(): # Tailored means it's a match for this machine # based on it's MAC address (or some other criteria diff --git a/examples/minimal_installation.py b/examples/minimal_installation.py index d3f75af1..fd5dfcf7 100644 --- a/examples/minimal_installation.py +++ b/examples/minimal_installation.py @@ -1,16 +1,14 @@ from pathlib import Path import archinstall -from archinstall import info, debug -from archinstall import Installer, ConfigurationOutput +from archinstall import ConfigurationOutput, Installer, debug, info from archinstall.default_profiles.minimal import MinimalProfile -from archinstall.lib.interactions import suggest_single_disk_layout, select_devices +from archinstall.lib import disk +from archinstall.lib.interactions import select_devices, suggest_single_disk_layout from archinstall.lib.models import Bootloader, User from archinstall.lib.profile import ProfileConfiguration, profile_handler -from archinstall.lib import disk from archinstall.tui import Tui - info("Minimal only supports:") info(" * Being installed to a single disk") diff --git a/examples/only_hd_installation.py b/examples/only_hd_installation.py index b50455c7..12459cda 100644 --- a/examples/only_hd_installation.py +++ b/examples/only_hd_installation.py @@ -2,9 +2,9 @@ from pathlib import Path import archinstall from archinstall import debug -from archinstall.lib.installer import Installer -from archinstall.lib.configuration import ConfigurationOutput from archinstall.lib import disk +from archinstall.lib.configuration import ConfigurationOutput +from archinstall.lib.installer import Installer from archinstall.tui import Tui