Merge pull request 'refactor: move clan_cli.error to clan_lib.error' (#3677) from hsjobeki/clan-core:chores-1 into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3677

pkgs/clan-cli/clan_cli/machines/create.py

@@ -5,6 +5,7 @@ from dataclasses import dataclass
 from pathlib import Path
 
 from clan_lib.api import API
+from clan_lib.errors import ClanError
 from clan_lib.flake.flake import Flake
 from clan_lib.nix_models.inventory import (
     Machine as InventoryMachine,
@@ -17,7 +18,6 @@ from clan_lib.persist.util import apply_patch
 
 from clan_cli.completions import add_dynamic_completer, complete_tags
 from clan_cli.dirs import get_clan_flake_toplevel_or_env
-from clan_cli.errors import ClanError
 from clan_cli.git import commit_file
 from clan_cli.machines.list import list_machines
 from clan_cli.templates import (

pkgs/clan-cli/clan_cli/machines/hardware.py

@@ -6,11 +6,11 @@ from enum import Enum
 from pathlib import Path
 
 from clan_lib.api import API
+from clan_lib.errors import ClanCmdError, ClanError
 
 from clan_cli.cmd import RunOpts, run
 from clan_cli.completions import add_dynamic_completer, complete_machines
 from clan_cli.dirs import specific_machine_dir
-from clan_cli.errors import ClanCmdError, ClanError
 from clan_cli.git import commit_file
 from clan_cli.machines.machines import Machine
 from clan_cli.nix import nix_config, nix_eval

pkgs/clan-cli/clan_cli/machines/install.py

@@ -8,6 +8,7 @@ from pathlib import Path
 from tempfile import TemporaryDirectory
 
 from clan_lib.api import API
+from clan_lib.errors import ClanError
 
 from clan_cli.cmd import Log, RunOpts, run
 from clan_cli.completions import (
@@ -15,7 +16,6 @@ from clan_cli.completions import (
     complete_machines,
     complete_target_host,
 )
-from clan_cli.errors import ClanError
 from clan_cli.facts.generate import generate_facts
 from clan_cli.machines.hardware import HardwareConfig
 from clan_cli.machines.machines import Machine

pkgs/clan-cli/clan_cli/machines/inventory.py

@@ -1,11 +1,11 @@
 from clan_lib.api import API
+from clan_lib.errors import ClanError
 from clan_lib.nix_models.inventory import (
     Machine as InventoryMachine,
 )
 from clan_lib.persist.inventory_store import InventoryStore
 from clan_lib.persist.util import apply_patch
 
-from clan_cli.errors import ClanError
 from clan_cli.machines.machines import Machine
 
 

pkgs/clan-cli/clan_cli/machines/machines.py

@@ -9,10 +9,10 @@ from functools import cached_property
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
+from clan_lib.errors import ClanCmdError, ClanError
 from clan_lib.flake.flake import Flake
 
 from clan_cli.cmd import Log, RunOpts, run
-from clan_cli.errors import ClanCmdError, ClanError
 from clan_cli.facts import public_modules as facts_public_modules
 from clan_cli.facts import secret_modules as facts_secret_modules
 from clan_cli.nix import nix_config, nix_eval, nix_test_store

pkgs/clan-cli/clan_cli/machines/morph.py

@@ -7,12 +7,12 @@ import re
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
+from clan_lib.errors import ClanError
 from clan_lib.flake.flake import Flake
 from clan_lib.nix_models.inventory import Machine as InventoryMachine
 
 from clan_cli.cmd import Log, RunOpts, run
 from clan_cli.dirs import get_clan_flake_toplevel_or_env
-from clan_cli.errors import ClanError
 from clan_cli.machines.create import CreateOptions, create_machine
 from clan_cli.machines.machines import Machine
 from clan_cli.nix import nix_build, nix_command

pkgs/clan-cli/clan_cli/machines/update.py

@@ -8,6 +8,7 @@ import sys
 from contextlib import ExitStack
 
 from clan_lib.api import API
+from clan_lib.errors import ClanError
 
 from clan_cli.async_run import AsyncContext, AsyncOpts, AsyncRuntime, is_async_cancelled
 from clan_cli.cmd import Log, MsgColor, RunOpts, run
@@ -16,7 +17,6 @@ from clan_cli.completions import (
     add_dynamic_completer,
     complete_machines,
 )
-from clan_cli.errors import ClanError
 from clan_cli.facts.generate import generate_facts
 from clan_cli.facts.upload import upload_secrets
 from clan_cli.machines.list import list_machines