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

Author: svartkanin

.github/workflows/mypy.yaml

@@ -20,4 +20,4 @@ jobs:
             - run: python --version
             - run: mypy --version
             - name: run mypy
-              run: mypy --config-file pyproject.toml
+              run: mypy --show-traceback --config-file pyproject.toml

.github/workflows/python-publish.yml

@@ -1,4 +1,4 @@
-# This workflow will upload a Python Package using Twine when a release is created
+# This workflow will upload a Python Package when a release is created
 # For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
 
 name: Upload archinstall to PyPi

.pre-commit-config.yaml

@@ -39,6 +39,7 @@ repos:
     hooks:
     - id: mypy
       args: [
+        '--show-traceback',
         '--config-file=pyproject.toml'
       ]
       fail_fast: true
@@ -48,7 +49,7 @@ repos:
         - pytest
         - cryptography
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.7
+    rev: v0.11.8
     hooks:
       - id: ruff
         args: ["check", "--select", "I", "--fix"]

archinstall/lib/disk/encryption_menu.py

@@ -262,21 +262,21 @@ def select_encrypted_password() -> Password | None:
 
 
 def select_hsm(preset: Fido2Device | None = None) -> Fido2Device | None:
-	header = str(_('Select a FIDO2 device to use for HSM'))
+	header = str(_('Select a FIDO2 device to use for HSM')) + '\n'
 
 	try:
 		fido_devices = Fido2.get_fido2_devices()
 	except ValueError:
 		return None
 
 	if fido_devices:
-		group, table_header = MenuHelper.create_table(data=fido_devices)
-		header = f'{header}\n\n{table_header}'
+		group = MenuHelper(data=fido_devices).create_menu_group()
 
 		result = SelectMenu[Fido2Device](
 			group,
 			header=header,
 			alignment=Alignment.CENTER,
+			allow_skip=True
 		).run()
 
 		match result.type_:
@@ -307,13 +307,14 @@ def select_partitions_to_encrypt(
 	avail_partitions = [p for p in partitions if not p.exists()]
 
 	if avail_partitions:
-		group, header = MenuHelper.create_table(data=avail_partitions)
+		group = MenuHelper(data=avail_partitions).create_menu_group()
+		group.set_selected_by_value(preset)
 
 		result = SelectMenu[PartitionModification](
 			group,
-			header=header,
 			alignment=Alignment.CENTER,
-			multi=True
+			multi=True,
+			allow_skip=True
 		).run()
 
 		match result.type_:
@@ -335,11 +336,10 @@ def select_lvm_vols_to_encrypt(
 	volumes: list[LvmVolume] = lvm_config.get_all_volumes()
 
 	if volumes:
-		group, header = MenuHelper.create_table(data=volumes)
+		group = MenuHelper(data=volumes).create_menu_group()
 
 		result = SelectMenu[LvmVolume](
 			group,
-			header=header,
 			alignment=Alignment.CENTER,
 			multi=True
 		).run()

archinstall/lib/disk/partitioning_menu.py

@@ -509,7 +509,7 @@ def validate(value: str) -> str | None:
 
 		title = str(_('Size (default: {}): ')).format(max_size.format_highest())
 
-		result = EditMenu[str](
+		result = EditMenu(
 			title,
 			header=f'{prompt}\b',
 			allow_skip=True,

archinstall/lib/disk/subvolume_menu.py

@@ -41,7 +41,7 @@ def selected_action_display(self, selection: SubvolumeModification) -> str:
 		return str(selection.name)
 
 	def _add_subvolume(self, preset: SubvolumeModification | None = None) -> SubvolumeModification | None:
-		result = EditMenu[str](
+		result = EditMenu(
 			str(_('Subvolume name')),
 			alignment=Alignment.CENTER,
 			allow_skip=True,

archinstall/lib/interactions/disk_conf.py

@@ -60,13 +60,12 @@ def _preview_device_selection(item: MenuItem) -> str | None:
 	options = [d.device_info for d in devices]
 	presets = [p.device_info for p in preset]
 
-	group, header = MenuHelper.create_table(data=options)
+	group = MenuHelper(options).create_menu_group()
 	group.set_selected_by_value(presets)
 	group.set_preview_for_all(_preview_device_selection)
 
 	result = SelectMenu[_DeviceInfo](
 		group,
-		header=header,
 		alignment=Alignment.CENTER,
 		search_enabled=False,
 		multi=True,

archinstall/lib/interactions/general_conf.py

@@ -61,7 +61,7 @@ def ask_ntp(preset: bool = True) -> bool:
 
 
 def ask_hostname(preset: str | None = None) -> str | None:
-	result = EditMenu[str](
+	result = EditMenu(
 		str(_('Hostname')),
 		alignment=Alignment.CENTER,
 		allow_skip=True,
@@ -260,7 +260,7 @@ def validator(s: str) -> str | None:
 
 		return str(_('Invalid download number'))
 
-	result = EditMenu[str](
+	result = EditMenu(
 		str(_('Number downloads')),
 		header=header,
 		allow_skip=True,

archinstall/lib/interactions/manage_users_conf.py

@@ -70,7 +70,7 @@ def _check_for_correct_username(self, username: str) -> str | None:
 		return str(_("The username you entered is invalid"))
 
 	def _add_user(self) -> User | None:
-		editResult = EditMenu[str](
+		editResult = EditMenu(
 			str(_('Username')),
 			allow_skip=True,
 			validator=self._check_for_correct_username

archinstall/lib/interactions/network_menu.py

@@ -106,7 +106,7 @@ def validator(ip: str) -> str | None:
 			except ValueError:
 				return str(_('You need to enter a valid IP in IP-config mode'))
 
-		result = EditMenu[str](
+		result = EditMenu(
 			title,
 			header=header,
 			validator=validator,