Merge remote-tracking branch 'upstream/master'

Author: mfgbhatti

.flake8

@@ -1,9 +1,8 @@
 [flake8]
 count = True
-ignore = W191,W503
+ignore = W191,W503,E704,E203
 max-complexity = 40
 max-line-length = 160
 show-source = True
 statistics = True
-builtins = _
 exclude = .git,__pycache__,build,docs,actions-runner

.github/workflows/python-publish.yml

@@ -11,19 +11,20 @@ jobs:
   deploy:
 
     runs-on: ubuntu-latest
-
+    permissions:
+      # IMPORTANT: this permission is mandatory for Trusted Publishing
+      id-token: write
+    container:
+      image: archlinux/archlinux:latest
+      options: --privileged
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
-        with:
-          python-version: '3.x'
       - name: Prepare arch
         run: |
           pacman-key --init
           pacman --noconfirm -Sy archlinux-keyring
           pacman --noconfirm -Syyu
-          pacman --noconfirm -Sy python-uv python-setuptools python-pip
+          pacman --noconfirm -Sy python python-uv python-setuptools python-pip python-pyparted python-pydantic
       - name: Build archinstall
         run: |
           uv build --no-build-isolation --wheel

.github/workflows/ruff-format.yaml

@@ -0,0 +1,12 @@
+on: [ push, pull_request ]
+name: ruff check formatting
+jobs:
+  ruff_format_check:
+    runs-on: ubuntu-latest
+    container:
+        image: archlinux/archlinux:latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: astral-sh/ruff-action@eaf0ecdd668ceea36159ff9d91882c9795d89b49  # v3.4.0
+      - run: ruff check --select=COM812 --fix
+      - run: ruff format --diff

.github/workflows/ruff.yaml .github/workflows/ruff-lint.yaml.github/workflows/ruff.yaml renamed to .github/workflows/ruff-lint.yaml

@@ -1,8 +1,8 @@
 on: [ push, pull_request ]
-name: ruff linting
+name: ruff check linting
 jobs:
     ruff:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-            - uses: astral-sh/ruff-action@84f83ecf9e1e15d26b7984c7ec9cf73d39ffc946  # v3.3.1
+            - uses: astral-sh/ruff-action@eaf0ecdd668ceea36159ff9d91882c9795d89b49  # v3.4.0

.pre-commit-config.yaml

@@ -1,17 +1,15 @@
 default_stages: ['pre-commit']
 repos:
-  - repo: https://github.com/pycqa/autoflake
-    rev: v2.3.1
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.11.11
     hooks:
-      - id: autoflake
-        args: [
-          '--in-place',
-          '--remove-all-unused-imports',
-          '--ignore-init-module-imports'
-        ]
-        files: \.py$
-        require_serial: true
-        fail_fast: true
+        # fix unused imports and sort them
+      - id: ruff
+        args: ["--extend-select", "I", "--fix"]
+        # format the code
+      - id: ruff-format
+        # run the linter
+      - id: ruff
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
@@ -23,8 +21,6 @@ repos:
     - id: check-yaml  # Attempts to load all yaml files to verify syntax
     - id: destroyed-symlinks  # Detects symlinks which are changed to regular files
     - id: detect-private-key  # Checks for the existence of private keys
-    - id: end-of-file-fixer  # Makes sure files end in a newline and only a newline
-    - id: trailing-whitespace  # Trims trailing whitespace
     # Python specific hooks:
     - id: check-ast  # Simply check whether files parse as valid python
     - id: check-docstring-first  # Checks for a common error of placing code before the docstring
@@ -47,13 +43,6 @@ repos:
         - pydantic
         - pytest
         - cryptography
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.9
-    hooks:
-      - id: ruff
-        args: ["check", "--select", "I", "--fix"]
-        fail_fast: true
-      - id: ruff
   - repo: local
     hooks:
       - id: pylint

PKGBUILD

@@ -4,7 +4,7 @@
 # Contributor: demostanis worlds <demostanis@protonmail.com>
 
 pkgname=archinstall
-pkgver=3.0.4
+pkgver=3.0.6
 pkgrel=1
 pkgdesc="Just another guided/automated Arch Linux installer with a twist"
 arch=(any)

README.md

@@ -226,7 +226,7 @@ This can be done by installing `pacman -S arch-install-scripts util-linux` local
     # losetup --partscan --show --find ./testimage.img
     # pip install --upgrade archinstall
     # python -m archinstall --script guided
-    # qemu-system-x86_64 -enable-kvm -machine q35,accel=kvm -device intel-iommu -cpu host -m 4096 -boot order=d -drive file=./testimage.img,format=raw -drive if=pflash,format=raw,readonly,file=/usr/share/ovmf/x64/OVMF_CODE.fd -drive if=pflash,format=raw,readonly,file=/usr/share/ovmf/x64/OVMF_VARS.fd
+    # qemu-system-x86_64 -enable-kvm -machine q35,accel=kvm -device intel-iommu -cpu host -m 4096 -boot order=d -drive file=./testimage.img,format=raw -drive if=pflash,format=raw,readonly,file=/usr/share/ovmf/x64/OVMF.4m.fd -drive if=pflash,format=raw,readonly,file=/usr/share/ovmf/x64/OVMF.4m.fd 
 
 This will create a *20 GB* `testimage.img` and create a loop device which we can use to format and install to.<br>
 `archinstall` is installed and executed in [guided mode](#docs-todo). Once the installation is complete, ~~you can use qemu/kvm to boot the test media.~~<br>

archinstall/__init__.py

@@ -5,7 +5,6 @@
 import sys
 import time
 import traceback
-from typing import TYPE_CHECKING
 
 from archinstall.lib.args import arch_config_handler
 from archinstall.lib.disk.utils import disk_layouts
@@ -14,14 +13,9 @@
 from .lib.output import FormattedOutput, debug, error, info, log, warn
 from .lib.pacman import Pacman
 from .lib.plugins import load_plugin, plugins
-from .lib.translationhandler import DeferredTranslation, Language, translation_handler
+from .lib.translationhandler import Language, tr, translation_handler
 from .tui.curses_menu import Tui
 
-if TYPE_CHECKING:
-	from collections.abc import Callable
-
-	_: Callable[[str], DeferredTranslation]
-
 
 # @archinstall.plugin decorator hook to programmatically add
 # plugins in runtime. Useful in profiles_bck and other things.
@@ -31,31 +25,36 @@ def plugin(f, *args, **kwargs) -> None:  # type: ignore[no-untyped-def]
 
 def _log_sys_info() -> None:
 	# Log various information about hardware before starting the installation. This might assist in troubleshooting
-	debug(f"Hardware model detected: {SysInfo.sys_vendor()} {SysInfo.product_name()}; UEFI mode: {SysInfo.has_uefi()}")
-	debug(f"Processor model detected: {SysInfo.cpu_model()}")
-	debug(f"Memory statistics: {SysInfo.mem_available()} available out of {SysInfo.mem_total()} total installed")
-	debug(f"Virtualization detected: {SysInfo.virtualization()}; is VM: {SysInfo.is_vm()}")
-	debug(f"Graphics devices detected: {SysInfo._graphics_devices().keys()}")
+	debug(f'Hardware model detected: {SysInfo.sys_vendor()} {SysInfo.product_name()}; UEFI mode: {SysInfo.has_uefi()}')
+	debug(f'Processor model detected: {SysInfo.cpu_model()}')
+	debug(f'Memory statistics: {SysInfo.mem_available()} available out of {SysInfo.mem_total()} total installed')
+	debug(f'Virtualization detected: {SysInfo.virtualization()}; is VM: {SysInfo.is_vm()}')
+	debug(f'Graphics devices detected: {SysInfo._graphics_devices().keys()}')
 
 	# For support reasons, we'll log the disk layout pre installation to match against post-installation layout
-	debug(f"Disk states before installing:\n{disk_layouts()}")
+	debug(f'Disk states before installing:\n{disk_layouts()}')
 
 
 def _fetch_arch_db() -> None:
-	info("Fetching Arch Linux package database...")
+	info('Fetching Arch Linux package database...')
 	try:
-		Pacman.run("-Sy")
+		Pacman.run('-Sy')
 	except Exception as e:
+		error('Failed to sync Arch Linux package database.')
+		if 'could not resolve host' in str(e).lower():
+			error('Most likely due to a missing network connection or DNS issue.')
+		error('Run archinstall --debug and check /var/log/archinstall/install.log for details.')
+
 		debug(f'Failed to sync Arch Linux package database: {e}')
 		exit(1)
 
 
 def _check_new_version() -> None:
-	info("Checking version...")
+	info('Checking version...')
 	upgrade = None
 
 	try:
-		upgrade = Pacman.run("-Qu archinstall").decode()
+		upgrade = Pacman.run('-Qu archinstall').decode()
 	except Exception as e:
 		debug(f'Failed determine pacman version: {e}')
 
@@ -76,7 +75,7 @@ def main() -> int:
 		return 0
 
 	if os.getuid() != 0:
-		print(_("Archinstall requires root privileges to run. See --help for more."))
+		print(tr('Archinstall requires root privileges to run. See --help for more.'))
 		return 1
 
 	_log_sys_info()
@@ -115,7 +114,7 @@ def run_as_a_module() -> None:
 			text = (
 				'Archinstall experienced the above error. If you think this is a bug, please report it to\n'
 				'https://github.com/archlinux/archinstall and include the log file "/var/log/archinstall/install.log".\n\n'
-				'Hint: To extract the log from a live ISO \ncurl -F\'file=@/var/log/archinstall/install.log\' https://0x0.st\n'
+				"Hint: To extract the log from a live ISO \ncurl -F'file=@/var/log/archinstall/install.log' https://0x0.st\n"
 			)
 
 			warn(text)
@@ -125,7 +124,6 @@ def run_as_a_module() -> None:
 
 
 __all__ = [
-	'DeferredTranslation',
 	'FormattedOutput',
 	'Language',
 	'Pacman',

archinstall/default_profiles/applications/pipewire.py

@@ -21,19 +21,20 @@ def packages(self) -> list[str]:
 			'pipewire-pulse',
 			'gst-plugin-pipewire',
 			'libpulse',
-			'wireplumber'
+			'wireplumber',
 		]
 
 	def _enable_pipewire_for_all(self, install_session: 'Installer') -> None:
 		from archinstall.lib.args import arch_config_handler
+
 		users: list[User] | None = arch_config_handler.config.users
 
 		if users is None:
 			return
 
 		for user in users:
 			# Create the full path for enabling the pipewire systemd items
-			service_dir = install_session.target / "home" / user.username / ".config" / "systemd" / "user" / "default.target.wants"
+			service_dir = install_session.target / 'home' / user.username / '.config' / 'systemd' / 'user' / 'default.target.wants'
 			service_dir.mkdir(parents=True, exist_ok=True)
 
 			# Set ownership of the entire user catalogue
@@ -42,11 +43,11 @@ def _enable_pipewire_for_all(self, install_session: 'Installer') -> None:
 			# symlink in the correct pipewire systemd items
 			install_session.arch_chroot(
 				f'ln -sf /usr/lib/systemd/user/pipewire-pulse.service /home/{user.username}/.config/systemd/user/default.target.wants/pipewire-pulse.service',
-				run_as=user.username
+				run_as=user.username,
 			)
 			install_session.arch_chroot(
 				f'ln -sf /usr/lib/systemd/user/pipewire-pulse.socket /home/{user.username}/.config/systemd/user/default.target.wants/pipewire-pulse.socket',
-				run_as=user.username
+				run_as=user.username,
 			)
 
 	@override

archinstall/default_profiles/desktop.py

@@ -18,7 +18,7 @@ def __init__(self, current_selection: list[Profile] = []) -> None:
 			'Desktop',
 			ProfileType.Desktop,
 			current_selection=current_selection,
-			support_greeter=True
+			support_greeter=True,
 		)
 
 	@property
@@ -34,7 +34,7 @@ def packages(self) -> list[str]:
 			'wireless_tools',
 			'wpa_supplicant',
 			'smartmontools',
-			'xdg-utils'
+			'xdg-utils',
 		]
 
 	@property
@@ -61,8 +61,9 @@ def do_on_select(self) -> SelectResult:
 			MenuItem(
 				p.name,
 				value=p,
-				preview_action=lambda x: x.value.preview_text()
-			) for p in profile_handler.get_desktop_profiles()
+				preview_action=lambda x: x.value.preview_text(),
+			)
+			for p in profile_handler.get_desktop_profiles()
 		]
 
 		group = MenuItemGroup(items, sort_items=True, sort_case_sensitive=False)
@@ -75,7 +76,7 @@ def do_on_select(self) -> SelectResult:
 			allow_skip=True,
 			preview_style=PreviewStyle.RIGHT,
 			preview_size='auto',
-			preview_frame=FrameProperties.max('Info')
+			preview_frame=FrameProperties.max('Info'),
 		).run()
 
 		match result.type_: