Skip to content

Commit af9028d

Browse files
committed
Merge remote-tracking branch 'origin/master' into rename-network-config
2 parents 8f8b41c + b0908b8 commit af9028d

5 files changed

Lines changed: 3 additions & 7 deletions

File tree

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
default_stages: ['pre-commit']
22
repos:
33
- repo: https://github.com/astral-sh/ruff-pre-commit
4-
rev: v0.12.3
4+
rev: v0.12.4
55
hooks:
66
# fix unused imports and sort them
77
- id: ruff

archinstall/lib/args.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
from archinstall.lib.models.network import NetworkConfiguration
2323
from archinstall.lib.models.packages import Repository
2424
from archinstall.lib.models.profile import ProfileConfiguration
25-
from archinstall.lib.models.users import Password, User
26-
from archinstall.lib.models.profile_model import ProfileConfiguration
2725
from archinstall.lib.models.users import Password, User, UserSerialization
2826
from archinstall.lib.output import debug, error, logger, warn
2927
from archinstall.lib.plugins import load_plugin

archinstall/lib/disk/fido.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def get_fido2_devices(cls) -> list[Fido2Device]:
3030
cls._loaded_u2f = True
3131
try:
3232
ret = SysCommand('fido2-token -L').decode()
33-
except SysCallError as e:
33+
except Exception as e:
3434
error(f'failed to read fido2 devices: {e}')
3535
return []
3636

archinstall/lib/global_menu.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
from .models.network import NetworkConfiguration, NicType
3434
from .models.packages import Repository
3535
from .models.profile import ProfileConfiguration
36-
from .models.users import Password, User
37-
from .models.profile_model import ProfileConfiguration
3836
from .models.users import User
3937
from .output import FormattedOutput
4038
from .pacman.config import PacmanConfig

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dev = [
3434
"mypy==1.17.0",
3535
"flake8==7.3.0",
3636
"pre-commit==4.2.0",
37-
"ruff==0.12.3",
37+
"ruff==0.12.4",
3838
"pylint==3.3.7",
3939
"pylint-pydantic==0.3.5",
4040
"pytest==8.4.1",

0 commit comments

Comments
 (0)