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

chore(nix_models): migrate import to use exported clan models

Browse Source
This commit is contained in:
Johannes Kirschbauer
2025-05-27 10:27:46 +02:00
parent 1ef2e13c85
commit d482e22610
14 changed files with 223 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/clan-cli/clan_cli/clan/show.py
View File

@@ -9,7 +9,7 @@ from clan_lib.cmd import run
from clan_lib.errors import ClanCmdError, ClanError
from clan_lib.flake import Flake
from clan_lib.nix import nix_eval
from clan_lib.nix_models.inventory import Meta
from clan_lib.nix_models.clan import InventoryMeta as Meta
log = logging.getLogger(__name__)

3
pkgs/clan-cli/clan_cli/clan/update.py
View File

@@ -2,7 +2,8 @@ from dataclasses import dataclass
from clan_lib.api import API
from clan_lib.flake import Flake
from clan_lib.nix_models.inventory import Inventory, Meta
from clan_lib.nix_models.clan import Inventory
from clan_lib.nix_models.clan import InventoryMeta as Meta
from clan_lib.persist.inventory_store import InventoryStore
from clan_lib.persist.util import set_value_by_path

8
pkgs/clan-cli/clan_cli/machines/create.py
View File

@@ -9,12 +9,8 @@ from clan_lib.dirs import get_clan_flake_toplevel_or_env
from clan_lib.errors import ClanError
from clan_lib.flake import Flake
from clan_lib.git import commit_file
from clan_lib.nix_models.inventory import (
Machine as InventoryMachine,
)
from clan_lib.nix_models.inventory import (
MachineDeploy,
)
from clan_lib.nix_models.clan import InventoryMachine
from clan_lib.nix_models.clan import InventoryMachineDeploy as MachineDeploy
from clan_lib.persist.inventory_store import InventoryStore
from clan_lib.persist.util import set_value_by_path
from clan_lib.templates import (

2
pkgs/clan-cli/clan_cli/machines/list.py
View File

@@ -11,7 +11,7 @@ from clan_lib.errors import ClanError
from clan_lib.flake import Flake
from clan_lib.machines.actions import get_machine
from clan_lib.machines.machines import Machine
from clan_lib.nix_models.inventory import Machine as InventoryMachine
from clan_lib.nix_models.clan import InventoryMachine
from clan_lib.persist.inventory_store import InventoryStore
from clan_cli.completions import add_dynamic_completer, complete_tags

2
pkgs/clan-cli/clan_cli/machines/morph.py
View File

@@ -13,7 +13,7 @@ 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_build, nix_command
from clan_lib.nix_models.inventory import Machine as InventoryMachine
from clan_lib.nix_models.clan import InventoryMachine
from clan_cli.machines.create import CreateOptions, create_machine
from clan_cli.vars.generate import generate_vars

5
pkgs/clan-cli/clan_cli/tests/test_inventory.py
View File

@@ -1,4 +1,7 @@
from clan_lib.nix_models.inventory import Inventory, Machine, Meta, Service
from clan_lib.nix_models.clan import Inventory
from clan_lib.nix_models.clan import InventoryMachine as Machine
from clan_lib.nix_models.clan import InventoryMeta as Meta
from clan_lib.nix_models.clan import InventoryService as Service
def test_make_meta_minimal() -> None:

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

@@ -8,9 +8,11 @@ from clan_cli.tests.fixtures_flakes import FlakeForTest
from clan_lib.api.modules import list_modules
from clan_lib.flake import Flake
from clan_lib.nix import nix_eval, run
from clan_lib.nix_models.inventory import (
Machine,
MachineDeploy,
from clan_lib.nix_models.clan import (
InventoryMachine as Machine,
)
from clan_lib.nix_models.clan import (
InventoryMachineDeploy as MachineDeploy,
)
from clan_lib.persist.inventory_store import InventoryStore
from clan_lib.persist.util import set_value_by_path