clan-cli: clan_cli.cmd -> clan_lib.cmd

pkgs/clan-cli/clan_cli/tests/test_clan_nix_attrset.py

@@ -5,7 +5,6 @@ from pathlib import Path
 from typing import Any
 
 import pytest
-from clan_cli.cmd import run
 from clan_cli.git import commit_file
 from clan_cli.locked_open import locked_open
 from clan_cli.templates import (
@@ -18,6 +17,7 @@ from clan_cli.templates import (
     list_templates,
 )
 from clan_cli.tests.fixtures_flakes import FlakeForTest
+from clan_lib.cmd import run
 from clan_lib.flake import Flake
 from clan_lib.nix import nix_command
 

pkgs/clan-cli/clan_cli/tests/test_create_flake.py

@@ -3,10 +3,10 @@ import logging
 from pathlib import Path
 
 import pytest
-from clan_cli.cmd import run
 from clan_cli.tests.fixtures_flakes import FlakeForTest, substitute
 from clan_cli.tests.helpers import cli
 from clan_cli.tests.stdout import CaptureOutput
+from clan_lib.cmd import run
 from clan_lib.nix import nix_flake_show
 
 log = logging.getLogger(__name__)

pkgs/clan-cli/clan_cli/tests/test_ssh_local.py

@@ -1,6 +1,6 @@
 from clan_cli.async_run import AsyncRuntime
-from clan_cli.cmd import ClanCmdTimeoutError, Log, RunOpts
 from clan_cli.ssh.host import Host
+from clan_lib.cmd import ClanCmdTimeoutError, Log, RunOpts
 
 host = Host("some_host")
 

pkgs/clan-cli/clan_cli/tests/test_ssh_remote.py

@@ -5,10 +5,10 @@ from typing import Any, NamedTuple
 
 import pytest
 from clan_cli.async_run import AsyncRuntime
-from clan_cli.cmd import ClanCmdTimeoutError, Log, RunOpts
 from clan_cli.ssh.host import Host
 from clan_cli.ssh.host_key import HostKeyCheck
 from clan_cli.ssh.parse import parse_deployment_address
+from clan_lib.cmd import ClanCmdTimeoutError, Log, RunOpts
 from clan_lib.errors import ClanError, CmdOut
 
 if sys.platform == "darwin":

pkgs/clan-cli/clan_cli/tests/test_vars_deployment.py

@@ -4,13 +4,13 @@ import sys
 from contextlib import ExitStack
 
 import pytest
-from clan_cli import cmd
 from clan_cli.machines.machines import Machine
 from clan_cli.tests.age_keys import SopsSetup
 from clan_cli.tests.fixtures_flakes import ClanFlake
 from clan_cli.tests.helpers import cli
 from clan_cli.tests.nix_config import ConfigItem
 from clan_cli.vms.run import inspect_vm, spawn_vm
+from clan_lib import cmd
 from clan_lib.flake import Flake
 from clan_lib.nix import nix_eval, run