Merge remote-tracking branch 'origin/master' into integrate-curses

.github/workflows/bandit.yaml

@@ -1,7 +1,7 @@
 on: [ push, pull_request ]
 name: Bandit security checkup
 jobs:
-    flake8:
+    bandit:
         runs-on: ubuntu-latest
         container:
             image: archlinux/archlinux:latest

.github/workflows/flake8.yaml

@@ -14,7 +14,7 @@ jobs:
                 pacman --noconfirm -Syyu
                 pacman --noconfirm -Sy python-pip python-pyparted python-simple-term-menu 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
+            # this will install the exact version of flake8 that is in the pyproject.toml file
             - name: Install archinstall dependencies
               run: pip install --break-system-packages .[dev]
             - run: python --version

.pre-commit-config.yaml

@@ -40,6 +40,6 @@ repos:
     - id: mypy
       fail_fast: true
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.3
+    rev: v0.6.5
     hooks:
       - id: ruff

archinstall/default_profiles/applications/pipewire.py

@@ -1,4 +1,4 @@
-from typing import List, Union, Any, TYPE_CHECKING
+from typing import Union, Any, TYPE_CHECKING
 
 import archinstall
 
@@ -15,7 +15,7 @@ def __init__(self) -> None:
 		super().__init__('Pipewire', ProfileType.Application)
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return [
 			'pipewire',
 			'pipewire-alsa',
@@ -27,7 +27,7 @@ def packages(self) -> List[str]:
 		]
 
 	def _enable_pipewire_for_all(self, install_session: 'Installer') -> None:
-		users: Union[User, List[User]] = archinstall.arguments.get('!users', [])
+		users: Union[User, list[User]] = archinstall.arguments.get('!users', [])
 		if not isinstance(users, list):
 			users = [users]
 

archinstall/default_profiles/desktops/awesome.py

@@ -1,4 +1,4 @@
-from typing import List, Any, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 
 from archinstall.default_profiles.profile import ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -13,7 +13,7 @@ def __init__(self) -> None:
 		super().__init__('Awesome', ProfileType.WindowMgr, description='')
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return super().packages + [
 			'awesome',
 			'alacritty',

archinstall/default_profiles/desktops/bspwm.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Any, TYPE_CHECKING
+from typing import Optional, Any, TYPE_CHECKING
 
 from archinstall.default_profiles.profile import ProfileType, GreeterType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -12,7 +12,7 @@ def __init__(self) -> None:
 		super().__init__('Bspwm', ProfileType.WindowMgr, description='')
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		# return super().packages + [
 		return [
 			'bspwm',

archinstall/default_profiles/desktops/budgie.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Any, TYPE_CHECKING
+from typing import Optional, Any, TYPE_CHECKING
 
 from archinstall.default_profiles.profile import ProfileType, GreeterType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -12,7 +12,7 @@ def __init__(self) -> None:
 		super().__init__('Budgie', ProfileType.DesktopEnv, description='')
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return [
 			"arc-gtk-theme",
 			"budgie",

archinstall/default_profiles/desktops/cinnamon.py

@@ -1,4 +1,4 @@
-from typing import Optional, List, Any, TYPE_CHECKING
+from typing import Optional, Any, TYPE_CHECKING
 
 from archinstall.default_profiles.profile import ProfileType, GreeterType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -12,7 +12,7 @@ def __init__(self) -> None:
 		super().__init__('Cinnamon', ProfileType.DesktopEnv, description='')
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return [
 			"cinnamon",
 			"system-config-printer",

archinstall/default_profiles/desktops/cosmic.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Any, TYPE_CHECKING
+from typing import Optional, Any, TYPE_CHECKING
 
 from archinstall.default_profiles.profile import ProfileType, GreeterType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -12,7 +12,7 @@ def __init__(self) -> None:
 		super().__init__('cosmic-epoch', ProfileType.DesktopEnv, description='', advanced=True)
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return [
 			"cosmic",
 		]

archinstall/default_profiles/desktops/cutefish.py

@@ -1,4 +1,4 @@
-from typing import Optional, List, Any, TYPE_CHECKING
+from typing import Optional, Any, TYPE_CHECKING
 
 from archinstall.default_profiles.profile import ProfileType, GreeterType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -13,7 +13,7 @@ def __init__(self) -> None:
 		super().__init__('Cutefish', ProfileType.DesktopEnv, description='')
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return [
 			"cutefish",
 			"noto-fonts"

archinstall/default_profiles/desktops/deepin.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Any, TYPE_CHECKING
+from typing import Optional, Any, TYPE_CHECKING
 
 from archinstall.default_profiles.profile import ProfileType, GreeterType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -12,7 +12,7 @@ def __init__(self) -> None:
 		super().__init__('Deepin', ProfileType.DesktopEnv, description='')
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return [
 			"deepin",
 			"deepin-terminal",

archinstall/default_profiles/desktops/enlightenment.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Any, TYPE_CHECKING
+from typing import Optional, Any, TYPE_CHECKING
 
 from archinstall.default_profiles.profile import ProfileType, GreeterType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -12,7 +12,7 @@ def __init__(self) -> None:
 		super().__init__('Enlightenment', ProfileType.WindowMgr, description='')
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return [
 			"enlightenment",
 			"terminology"

archinstall/default_profiles/desktops/gnome.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Any, TYPE_CHECKING
+from typing import Optional, Any, TYPE_CHECKING
 
 from archinstall.default_profiles.profile import ProfileType, GreeterType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -12,7 +12,7 @@ def __init__(self) -> None:
 		super().__init__('Gnome', ProfileType.DesktopEnv, description='')
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return [
 			'gnome',
 			'gnome-tweaks'

archinstall/default_profiles/desktops/i3.py

@@ -1,4 +1,4 @@
-from typing import Optional, List, Any, TYPE_CHECKING
+from typing import Optional, Any, TYPE_CHECKING
 
 from archinstall.default_profiles.profile import ProfileType, GreeterType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -12,7 +12,7 @@ def __init__(self) -> None:
 		super().__init__('i3-wm', ProfileType.WindowMgr, description='')
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return [
 			'i3-wm',
 			'i3lock',

archinstall/default_profiles/desktops/lxqt.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Any, TYPE_CHECKING
+from typing import Optional, Any, TYPE_CHECKING
 
 from archinstall.default_profiles.profile import ProfileType, GreeterType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -15,7 +15,7 @@ def __init__(self) -> None:
 	# LXQt works with lightdm, but since this is not supported, we will not default to this.
 	# https://github.com/lxqt/lxqt/issues/795
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return [
 			"lxqt",
 			"breeze-icons",

archinstall/default_profiles/desktops/mate.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Any, TYPE_CHECKING
+from typing import Optional, Any, TYPE_CHECKING
 
 from archinstall.default_profiles.profile import ProfileType, GreeterType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -12,7 +12,7 @@ def __init__(self) -> None:
 		super().__init__('Mate', ProfileType.DesktopEnv, description='')
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return [
 			"mate",
 			"mate-extra"

archinstall/default_profiles/desktops/plasma.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Any, TYPE_CHECKING
+from typing import Optional, Any, TYPE_CHECKING
 
 from archinstall.default_profiles.profile import ProfileType, GreeterType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -12,7 +12,7 @@ def __init__(self) -> None:
 		super().__init__('KDE Plasma', ProfileType.DesktopEnv, description='')
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return [
 			"plasma-meta",
 			"konsole",

archinstall/default_profiles/desktops/qtile.py

@@ -1,4 +1,4 @@
-from typing import Optional, List, Any, TYPE_CHECKING
+from typing import Optional, Any, TYPE_CHECKING
 
 from archinstall.default_profiles.profile import ProfileType, GreeterType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -12,7 +12,7 @@ def __init__(self) -> None:
 		super().__init__('Qtile', ProfileType.WindowMgr, description='')
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return [
 			'qtile',
 			'alacritty'

archinstall/default_profiles/desktops/xfce4.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Any, TYPE_CHECKING
+from typing import Optional, Any, TYPE_CHECKING
 
 from archinstall.default_profiles.profile import ProfileType, GreeterType
 from archinstall.default_profiles.xorg import XorgProfile
@@ -12,7 +12,7 @@ def __init__(self) -> None:
 		super().__init__('Xfce4', ProfileType.DesktopEnv, description='')
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return [
 			"xfce4",
 			"xfce4-goodies",

archinstall/default_profiles/servers/cockpit.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from archinstall.default_profiles.profile import Profile, ProfileType
 
 
@@ -11,9 +9,9 @@ def __init__(self) -> None:
 		)
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return ['cockpit', 'udisks2', 'packagekit']
 
 	@property
-	def services(self) -> List[str]:
+	def services(self) -> list[str]:
 		return ['cockpit.socket']

archinstall/default_profiles/servers/docker.py

@@ -1,4 +1,4 @@
-from typing import List, Union, TYPE_CHECKING
+from typing import Union, TYPE_CHECKING
 
 import archinstall
 
@@ -17,15 +17,15 @@ def __init__(self) -> None:
 		)
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return ['docker']
 
 	@property
-	def services(self) -> List[str]:
+	def services(self) -> list[str]:
 		return ['docker']
 
 	def post_install(self, install_session: 'Installer') -> None:
-		users: Union[User, List[User]] = archinstall.arguments.get('!users', [])
+		users: Union[User, list[User]] = archinstall.arguments.get('!users', [])
 		if not isinstance(users, list):
 			users = [users]
 

archinstall/default_profiles/servers/httpd.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from archinstall.default_profiles.profile import Profile, ProfileType
 
 
@@ -11,9 +9,9 @@ def __init__(self) -> None:
 		)
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return ['apache']
 
 	@property
-	def services(self) -> List[str]:
+	def services(self) -> list[str]:
 		return ['httpd']

archinstall/default_profiles/servers/lighttpd.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from archinstall.default_profiles.profile import Profile, ProfileType
 
 
@@ -11,9 +9,9 @@ def __init__(self) -> None:
 		)
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return ['lighttpd']
 
 	@property
-	def services(self) -> List[str]:
+	def services(self) -> list[str]:
 		return ['lighttpd']

archinstall/default_profiles/servers/mariadb.py

@@ -1,4 +1,4 @@
-from typing import List, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from archinstall.default_profiles.profile import Profile, ProfileType
 
@@ -14,11 +14,11 @@ def __init__(self) -> None:
 		)
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return ['mariadb']
 
 	@property
-	def services(self) -> List[str]:
+	def services(self) -> list[str]:
 		return ['mariadb']
 
 	def post_install(self, install_session: 'Installer') -> None:

archinstall/default_profiles/servers/nginx.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from archinstall.default_profiles.profile import Profile, ProfileType
 
 
@@ -11,9 +9,9 @@ def __init__(self) -> None:
 		)
 
 	@property
-	def packages(self) -> List[str]:
+	def packages(self) -> list[str]:
 		return ['nginx']
 
 	@property
-	def services(self) -> List[str]:
+	def services(self) -> list[str]:
 		return ['nginx']