Merge remote-tracking branch 'origin/master' into fix-2916

.github/workflows/flake8.yaml

@@ -12,7 +12,7 @@ jobs:
                 pacman-key --init
                 pacman --noconfirm -Sy archlinux-keyring
                 pacman --noconfirm -Syyu
-                pacman --noconfirm -Sy python-pip python-pyparted python-simple-term-menu pkgconfig gcc
+                pacman --noconfirm -Sy python-pip python-pyparted pkgconfig gcc
             - run: pip install --break-system-packages --upgrade pip
             # this will install the exact version of flake8 that is in the pyproject.toml file
             - name: Install archinstall dependencies

.github/workflows/github-pages.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/setup-python@v5
       - name: Install pre-dependencies
         run: |
-          pacman -Sy --noconfirm tree git python-pyparted python-simple-term-menu python-setuptools python-sphinx python-sphinx_rtd_theme python-build python-installer python-wheel
+          pacman -Sy --noconfirm tree git python-pyparted python-setuptools python-sphinx python-sphinx_rtd_theme python-build python-installer python-wheel
       - name: Sphinx build
         run: |
           sphinx-build docs _build

.github/workflows/mypy.yaml

@@ -12,7 +12,7 @@ jobs:
                 pacman-key --init
                 pacman --noconfirm -Sy archlinux-keyring
                 pacman --noconfirm -Syyu
-                pacman --noconfirm -Sy python-pip python-pyparted python-simple-term-menu pkgconfig gcc
+                pacman --noconfirm -Sy python-pip python-pyparted pkgconfig gcc
             - run: pip install --break-system-packages --upgrade pip
             # this will install the exact version of mypy that is in the pyproject.toml file
             - name: Install archinstall dependencies

.github/workflows/pylint.yaml

@@ -12,7 +12,7 @@ jobs:
                 pacman-key --init
                 pacman --noconfirm -Sy archlinux-keyring
                 pacman --noconfirm -Syyu
-                pacman --noconfirm -Sy python-pip python-pyparted python-simple-term-menu pkgconfig gcc
+                pacman --noconfirm -Sy python-pip python-pyparted pkgconfig gcc
             - run: pip install --break-system-packages --upgrade pip
             - name: Install Pylint and Pylint plug-ins
               run: pip install --break-system-packages .[dev]

.github/workflows/python-build.yml

@@ -17,7 +17,7 @@ jobs:
           pacman-key --init
           pacman --noconfirm -Sy archlinux-keyring
           pacman --noconfirm -Syyu
-          pacman --noconfirm -Sy python-pip python-pydantic python-pyparted python-simple-term-menu pkgconfig gcc
+          pacman --noconfirm -Sy python-pip python-pydantic python-pyparted pkgconfig gcc
       - name: Install build dependencies
         run: |
           python -m pip install --break-system-packages --upgrade pip

.readthedocs.yaml

@@ -12,4 +12,4 @@ sphinx:
 build:
   os: "ubuntu-22.04"
   tools:
-    python: "3.11"
+    python: "3.12"

PKGBUILD

@@ -4,7 +4,7 @@
 # Contributor: demostanis worlds <[email protected]>
 
 pkgname=archinstall
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc="Just another guided/automated Arch Linux installer with a twist"
 arch=(any)
@@ -47,13 +47,11 @@ provides=(python-archinstall archinstall)
 conflicts=(python-archinstall archinstall-git)
 replaces=(python-archinstall archinstall-git)
 source=(
-  $pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz
-  $pkgname-$pkgver.tar.gz.sig::$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz.sig
+  $pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz
+  $pkgname-$pkgver.tar.gz.sig::$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz.sig
 )
-sha512sums=('64cb3593c5091b3885ad14ef073cfab31090b4f9bcb4405b18cf9b19adb5ca42255ba8891ec62e21f92d59872541ef6d94f186fb05c625822af63525441e08d9'
-            'SKIP')
-b2sums=('9c0ec0871841804377ba8310dc744711adcec4eed7319a8d89d684af8e7b822bb9d47540b00f4d746a9fcd7b9ea1b9e07bac773e6c28fabc760e4df38b16748b'
-        'SKIP')
+sha512sums=()
+b2sums=()
 validpgpkeys=('256F73CEEFC6705C6BBAB20E5FBBB32941E3740A') # Anton Hvornum (Torxed) <[email protected]>
 
 pkgver() {

archinstall/__init__.py

@@ -36,10 +36,12 @@
 from .tui import Tui
 
 if TYPE_CHECKING:
-	_: Any
+	from collections.abc import Callable
 
+	_: Callable[[str], DeferredTranslation]
 
-__version__ = "3.0.0"
+
+__version__ = "3.0.1"
 storage['__version__'] = __version__
 
 # add the custom _ as a builtin, it can now be used anywhere in the

archinstall/default_profiles/applications/pipewire.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, override
 
 import archinstall
 from archinstall.default_profiles.profile import Profile, ProfileType
@@ -13,6 +13,7 @@ def __init__(self) -> None:
 		super().__init__('Pipewire', ProfileType.Application)
 
 	@property
+	@override
 	def packages(self) -> list[str]:
 		return [
 			'pipewire',
@@ -51,6 +52,7 @@ def _enable_pipewire_for_all(self, install_session: 'Installer') -> None:
 				run_as=user.username
 			)
 
+	@override
 	def install(self, install_session: 'Installer') -> None:
 		super().install(install_session)
 		install_session.add_additional_packages(self.packages)

archinstall/default_profiles/desktop.py

@@ -1,13 +1,17 @@
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, override
 
 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.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):
@@ -21,6 +25,7 @@ def __init__(self, current_selection: list[Profile] = []) -> None:
 		)
 
 	@property
+	@override
 	def packages(self) -> list[str]:
 		return [
 			'nano',
@@ -36,6 +41,7 @@ def packages(self) -> list[str]:
 		]
 
 	@property
+	@override
 	def default_greeter_type(self) -> GreeterType | None:
 		combined_greeters: dict[GreeterType, int] = {}
 		for profile in self.current_selection:
@@ -52,6 +58,7 @@ def _do_on_select_profiles(self) -> None:
 		for profile in self.current_selection:
 			profile.do_on_select()
 
+	@override
 	def do_on_select(self) -> SelectResult | None:
 		items = [
 			MenuItem(
@@ -84,10 +91,12 @@ def do_on_select(self) -> SelectResult | None:
 			case ResultType.Reset:
 				return SelectResult.ResetCurrent
 
+	@override
 	def post_install(self, install_session: 'Installer') -> None:
 		for profile in self.current_selection:
 			profile.post_install(install_session)
 
+	@override
 	def install(self, install_session: 'Installer') -> None:
 		# Install common packages for all desktop environments
 		install_session.add_additional_packages(self.packages)

archinstall/default_profiles/desktops/awesome.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, override
 
 from archinstall.default_profiles.profile import ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -12,6 +12,7 @@ def __init__(self) -> None:
 		super().__init__('Awesome', ProfileType.WindowMgr, description='')
 
 	@property
+	@override
 	def packages(self) -> list[str]:
 		return super().packages + [
 			'awesome',
@@ -27,6 +28,7 @@ def packages(self) -> list[str]:
 			'xsel',
 		]
 
+	@override
 	def install(self, install_session: 'Installer') -> None:
 		super().install(install_session)
 

archinstall/default_profiles/desktops/bspwm.py

@@ -1,3 +1,5 @@
+from typing import override
+
 from archinstall.default_profiles.profile import GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
 
@@ -7,6 +9,7 @@ def __init__(self) -> None:
 		super().__init__('Bspwm', ProfileType.WindowMgr, description='')
 
 	@property
+	@override
 	def packages(self) -> list[str]:
 		# return super().packages + [
 		return [
@@ -18,5 +21,6 @@ def packages(self) -> list[str]:
 		]
 
 	@property
+	@override
 	def default_greeter_type(self) -> GreeterType | None:
 		return GreeterType.Lightdm

archinstall/default_profiles/desktops/budgie.py

@@ -1,3 +1,5 @@
+from typing import override
+
 from archinstall.default_profiles.profile import GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
 
@@ -7,6 +9,7 @@ def __init__(self) -> None:
 		super().__init__('Budgie', ProfileType.DesktopEnv, description='')
 
 	@property
+	@override
 	def packages(self) -> list[str]:
 		return [
 			"arc-gtk-theme",
@@ -17,5 +20,6 @@ def packages(self) -> list[str]:
 		]
 
 	@property
+	@override
 	def default_greeter_type(self) -> GreeterType | None:
 		return GreeterType.LightdmSlick

archinstall/default_profiles/desktops/cinnamon.py

@@ -1,3 +1,5 @@
+from typing import override
+
 from archinstall.default_profiles.profile import GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
 
@@ -7,6 +9,7 @@ def __init__(self) -> None:
 		super().__init__('Cinnamon', ProfileType.DesktopEnv, description='')
 
 	@property
+	@override
 	def packages(self) -> list[str]:
 		return [
 			"cinnamon",
@@ -23,5 +26,6 @@ def packages(self) -> list[str]:
 		]
 
 	@property
+	@override
 	def default_greeter_type(self) -> GreeterType | None:
 		return GreeterType.Lightdm

archinstall/default_profiles/desktops/cosmic.py

@@ -1,3 +1,5 @@
+from typing import override
+
 from archinstall.default_profiles.profile import GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
 
@@ -7,11 +9,13 @@ def __init__(self) -> None:
 		super().__init__('cosmic-epoch', ProfileType.DesktopEnv, description='', advanced=True)
 
 	@property
+	@override
 	def packages(self) -> list[str]:
 		return [
 			"cosmic",
 		]
 
 	@property
+	@override
 	def default_greeter_type(self) -> GreeterType | None:
 		return GreeterType.CosmicSession

archinstall/default_profiles/desktops/cutefish.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, override
 
 from archinstall.default_profiles.profile import GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -12,15 +12,18 @@ def __init__(self) -> None:
 		super().__init__('Cutefish', ProfileType.DesktopEnv, description='')
 
 	@property
+	@override
 	def packages(self) -> list[str]:
 		return [
 			"cutefish",
 			"noto-fonts"
 		]
 
 	@property
+	@override
 	def default_greeter_type(self) -> GreeterType | None:
 		return GreeterType.Sddm
 
+	@override
 	def install(self, install_session: 'Installer') -> None:
 		super().install(install_session)

archinstall/default_profiles/desktops/deepin.py

@@ -1,3 +1,5 @@
+from typing import override
+
 from archinstall.default_profiles.profile import GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
 
@@ -7,6 +9,7 @@ def __init__(self) -> None:
 		super().__init__('Deepin', ProfileType.DesktopEnv, description='')
 
 	@property
+	@override
 	def packages(self) -> list[str]:
 		return [
 			"deepin",
@@ -15,5 +18,6 @@ def packages(self) -> list[str]:
 		]
 
 	@property
+	@override
 	def default_greeter_type(self) -> GreeterType | None:
 		return GreeterType.Lightdm

archinstall/default_profiles/desktops/enlightenment.py

@@ -1,3 +1,5 @@
+from typing import override
+
 from archinstall.default_profiles.profile import GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
 
@@ -7,12 +9,14 @@ def __init__(self) -> None:
 		super().__init__('Enlightenment', ProfileType.WindowMgr, description='')
 
 	@property
+	@override
 	def packages(self) -> list[str]:
 		return [
 			"enlightenment",
 			"terminology"
 		]
 
 	@property
+	@override
 	def default_greeter_type(self) -> GreeterType | None:
 		return GreeterType.Lightdm

archinstall/default_profiles/desktops/gnome.py

@@ -1,3 +1,5 @@
+from typing import override
+
 from archinstall.default_profiles.profile import GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
 
@@ -7,12 +9,14 @@ def __init__(self) -> None:
 		super().__init__('Gnome', ProfileType.DesktopEnv, description='')
 
 	@property
+	@override
 	def packages(self) -> list[str]:
 		return [
 			'gnome',
 			'gnome-tweaks'
 		]
 
 	@property
+	@override
 	def default_greeter_type(self) -> GreeterType | None:
 		return GreeterType.Gdm