yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clan-cli: Move Machine object to clan_lib

Browse Source
This commit is contained in:
Qubasa
2025-05-22 19:11:19 +02:00
parent bbca0c9eed
commit 8b1968cca6
63 changed files with 71 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py
View File

@@ -10,7 +10,6 @@ from pathlib import Path
from typing import Any, NamedTuple
import pytest
from clan_cli.machines.machines import Machine
from clan_cli.tests import age_keys
from clan_cli.tests.fixture_error import FixtureError
from clan_cli.tests.root import CLAN_CORE
@@ -23,6 +22,7 @@ from clan_lib.dirs import (
)
from clan_lib.flake import Flake
from clan_lib.locked_open import locked_open
from clan_lib.machines.machines import Machine
from clan_lib.nix import nix_test_store
log = logging.getLogger(__name__)

2
pkgs/clan-cli/clan_cli/tests/test_modules.py
View File

@@ -18,8 +18,8 @@ from clan_lib.persist.inventory_store import InventoryStore
if TYPE_CHECKING:
from .age_keys import KeyPair
from clan_cli.machines.machines import Machine as MachineMachine
from clan_cli.tests.helpers import cli
from clan_lib.machines.machines import Machine as MachineMachine
@pytest.mark.with_core

2
pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py
View File

@@ -3,12 +3,12 @@ from typing import TYPE_CHECKING
import pytest
from clan_cli.facts.secret_modules.sops import SecretStore
from clan_cli.machines.machines import Machine
from clan_cli.secrets.folders import sops_secrets_folder
from clan_cli.tests.fixtures_flakes import FlakeForTest
from clan_cli.tests.helpers import cli
from clan_cli.tests.helpers.validator import is_valid_age_key
from clan_lib.flake import Flake
from clan_lib.machines.machines import Machine
if TYPE_CHECKING:
from .age_keys import KeyPair

2
pkgs/clan-cli/clan_cli/tests/test_vars.py
View File

@@ -4,7 +4,6 @@ import shutil
from pathlib import Path
import pytest
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
@@ -23,6 +22,7 @@ from clan_cli.vars.secret_modules import password_store, sops
from clan_cli.vars.set import set_var
from clan_lib.errors import ClanError
from clan_lib.flake import Flake
from clan_lib.machines.machines import Machine
from clan_lib.nix import nix_eval, run

2
pkgs/clan-cli/clan_cli/tests/test_vars_deployment.py
View File

@@ -4,7 +4,6 @@ import sys
from contextlib import ExitStack
import pytest
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
@@ -12,6 +11,7 @@ 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.machines.machines import Machine
from clan_lib.nix import nix_eval, run

2
pkgs/clan-cli/clan_cli/tests/test_vms_cli.py
View File

@@ -2,12 +2,12 @@ from pathlib import Path
from typing import TYPE_CHECKING
import pytest
from clan_cli.machines.machines import Machine
from clan_cli.tests.fixtures_flakes import ClanFlake, FlakeForTest
from clan_cli.tests.helpers import cli
from clan_cli.tests.stdout import CaptureOutput
from clan_cli.vms.run import inspect_vm, spawn_vm
from clan_lib.flake import Flake
from clan_lib.machines.machines import Machine
if TYPE_CHECKING:
from .age_keys import KeyPair