Enable unreachable code checks in lib/ with mypy (#3521)
This commit is contained in:
parent
2cf7c85728
commit
c2f4d92fd9
|
|
@ -176,20 +176,13 @@ class DiskLayoutConfigurationMenu(AbstractSubMenu[DiskLayoutConfiguration]):
|
||||||
alignment=Alignment.CENTER,
|
alignment=Alignment.CENTER,
|
||||||
).run()
|
).run()
|
||||||
|
|
||||||
snapshot_type: SnapshotType | None = None
|
|
||||||
|
|
||||||
match result.type_:
|
match result.type_:
|
||||||
case ResultType.Skip:
|
case ResultType.Skip:
|
||||||
return preset
|
return preset
|
||||||
case ResultType.Reset:
|
case ResultType.Reset:
|
||||||
return None
|
return None
|
||||||
case ResultType.Selection:
|
case ResultType.Selection:
|
||||||
snapshot_type = result.get_value()
|
return SnapshotConfig(snapshot_type=result.get_value())
|
||||||
|
|
||||||
if not snapshot_type:
|
|
||||||
return None
|
|
||||||
|
|
||||||
return SnapshotConfig(snapshot_type=snapshot_type)
|
|
||||||
|
|
||||||
def _prev_disk_layouts(self, item: MenuItem) -> str | None:
|
def _prev_disk_layouts(self, item: MenuItem) -> str | None:
|
||||||
if not item.value:
|
if not item.value:
|
||||||
|
|
|
||||||
|
|
@ -186,7 +186,7 @@ def ask_to_configure_network(preset: NetworkConfiguration | None) -> NetworkConf
|
||||||
if preset:
|
if preset:
|
||||||
group.set_selected_by_value(preset.type)
|
group.set_selected_by_value(preset.type)
|
||||||
|
|
||||||
result = SelectMenu[NetworkConfiguration](
|
result = SelectMenu[NicType](
|
||||||
group,
|
group,
|
||||||
alignment=Alignment.CENTER,
|
alignment=Alignment.CENTER,
|
||||||
frame=FrameProperties.min(tr('Network configuration')),
|
frame=FrameProperties.min(tr('Network configuration')),
|
||||||
|
|
|
||||||
|
|
@ -174,5 +174,3 @@ def ask_for_swap(preset: bool = True) -> bool:
|
||||||
return result.item() == MenuItem.yes()
|
return result.item() == MenuItem.yes()
|
||||||
case ResultType.Reset:
|
case ResultType.Reset:
|
||||||
raise ValueError('Unhandled result type')
|
raise ValueError('Unhandled result type')
|
||||||
|
|
||||||
return preset
|
|
||||||
|
|
|
||||||
|
|
@ -149,5 +149,3 @@ def select_kb_layout(preset: str | None = None) -> str | None:
|
||||||
return preset
|
return preset
|
||||||
case _:
|
case _:
|
||||||
raise ValueError('Unhandled return type')
|
raise ValueError('Unhandled return type')
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
|
||||||
|
|
@ -1490,9 +1490,8 @@ class DiskEncryption:
|
||||||
def should_generate_encryption_file(self, dev: PartitionModification | LvmVolume) -> bool:
|
def should_generate_encryption_file(self, dev: PartitionModification | LvmVolume) -> bool:
|
||||||
if isinstance(dev, PartitionModification):
|
if isinstance(dev, PartitionModification):
|
||||||
return dev in self.partitions and dev.mountpoint != Path('/')
|
return dev in self.partitions and dev.mountpoint != Path('/')
|
||||||
elif isinstance(dev, LvmVolume):
|
else:
|
||||||
return dev in self.lvm_volumes and dev.mountpoint != Path('/')
|
return dev in self.lvm_volumes and dev.mountpoint != Path('/')
|
||||||
return False
|
|
||||||
|
|
||||||
def json(self) -> _DiskEncryptionSerialization:
|
def json(self) -> _DiskEncryptionSerialization:
|
||||||
obj: _DiskEncryptionSerialization = {
|
obj: _DiskEncryptionSerialization = {
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ class FormattedOutput:
|
||||||
elif is_dataclass(o):
|
elif is_dataclass(o):
|
||||||
return asdict(o)
|
return asdict(o)
|
||||||
else:
|
else:
|
||||||
return o.__dict__
|
return o.__dict__ # type: ignore[unreachable]
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def as_table(
|
def as_table(
|
||||||
|
|
|
||||||
|
|
@ -237,5 +237,3 @@ def select_profile(
|
||||||
pass
|
pass
|
||||||
|
|
||||||
return current_profile
|
return current_profile
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
|
||||||
|
|
@ -100,7 +100,6 @@ module = "archinstall.lib.*"
|
||||||
disallow_incomplete_defs = false
|
disallow_incomplete_defs = false
|
||||||
disallow_untyped_defs = false
|
disallow_untyped_defs = false
|
||||||
warn_return_any = false
|
warn_return_any = false
|
||||||
warn_unreachable = false
|
|
||||||
|
|
||||||
[[tool.mypy.overrides]]
|
[[tool.mypy.overrides]]
|
||||||
module = "archinstall.lib.disk.*"
|
module = "archinstall.lib.disk.*"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue