diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index 66f561ac4fef..f14d3d0a09a9 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -433,14 +433,14 @@ def list_generations(profile: Profile) -> list[GenerationJson]: ) try: nixos_version = (generation_path / "nixos-version").read_text().strip() - except IOError as ex: + except OSError as ex: logger.debug("could not get nixos-version: %s", ex) nixos_version = "Unknown" try: kernel_version = next( (generation_path / "kernel-modules/lib/modules").iterdir() ).name - except IOError as ex: + except OSError as ex: logger.debug("could not get kernel version: %s", ex) kernel_version = "Unknown" specialisations = [ @@ -451,7 +451,7 @@ def list_generations(profile: Profile) -> list[GenerationJson]: [generation_path / "sw/bin/nixos-version", "--configuration-revision"], capture_output=True, ).stdout.strip() - except (CalledProcessError, IOError) as ex: + except (OSError, CalledProcessError) as ex: logger.debug("could not get configuration revision: %s", ex) configuration_revision = "Unknown" diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index 8905ab274508..dacedeba406c 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -3,9 +3,10 @@ import logging import os import shlex import subprocess +from collections.abc import Sequence from dataclasses import dataclass from getpass import getpass -from typing import Final, Self, Sequence, TypedDict, Unpack +from typing import Final, Self, TypedDict, Unpack from . import tmpdir diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml b/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml index 018d156fd381..9aac3bfb5a08 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/pyproject.toml @@ -41,6 +41,8 @@ ignore_missing_imports = true extend-select = [ # ensure imports are sorted "I", + # Automatically upgrade syntax for newer versions + "UP", # require `check` argument for `subprocess.run` "PLW1510", # check for needless exception names in raise statements