From fa052f45bd635520e65d0850b2f149d835250bf9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 16 May 2025 16:53:26 +0200 Subject: [PATCH] clan_lib: move clan_lib.flake.flake to clan_lib.flake --- pkgs/clan-cli/clan_cli/__init__.py | 2 +- pkgs/clan-cli/clan_cli/clan/create.py | 2 +- pkgs/clan-cli/clan_cli/clan/inspect.py | 2 +- pkgs/clan-cli/clan_cli/clan/show.py | 2 +- pkgs/clan-cli/clan_cli/clan/update.py | 2 +- pkgs/clan-cli/clan_cli/dirs.py | 2 +- pkgs/clan-cli/clan_cli/flash/flash_cmd.py | 2 +- pkgs/clan-cli/clan_cli/inventory/__init__.py | 2 +- pkgs/clan-cli/clan_cli/machines/create.py | 2 +- pkgs/clan-cli/clan_cli/machines/list.py | 2 +- pkgs/clan-cli/clan_cli/machines/machines.py | 2 +- pkgs/clan-cli/clan_cli/machines/machines_test.py | 2 +- pkgs/clan-cli/clan_cli/machines/morph.py | 2 +- pkgs/clan-cli/clan_cli/secrets/sops.py | 2 +- pkgs/clan-cli/clan_cli/select.py | 2 +- pkgs/clan-cli/clan_cli/templates.py | 2 +- pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py | 2 +- pkgs/clan-cli/clan_cli/tests/test_clan_nix_attrset.py | 2 +- pkgs/clan-cli/clan_cli/tests/test_flake_caching.py | 2 +- pkgs/clan-cli/clan_cli/tests/test_inventory_serde.py | 2 +- pkgs/clan-cli/clan_cli/tests/test_machines_cli.py | 2 +- pkgs/clan-cli/clan_cli/tests/test_modules.py | 2 +- pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py | 2 +- pkgs/clan-cli/clan_cli/tests/test_vars.py | 2 +- pkgs/clan-cli/clan_cli/tests/test_vars_deployment.py | 2 +- pkgs/clan-cli/clan_cli/tests/test_vms_cli.py | 2 +- pkgs/clan-cli/clan_cli/vars/generate.py | 2 +- pkgs/clan-cli/clan_cli/vars/get.py | 2 +- pkgs/clan-cli/clan_cli/vars/list.py | 2 +- pkgs/clan-cli/clan_cli/vars/set.py | 2 +- pkgs/clan-cli/clan_cli/vms/inspect.py | 2 +- pkgs/clan-cli/clan_lib/api/directory.py | 2 +- pkgs/clan-cli/clan_lib/api/modules.py | 2 +- pkgs/clan-cli/clan_lib/flake/__init__.py | 1 + pkgs/clan-cli/clan_lib/persist/inventory_store.py | 2 +- pkgs/clan-cli/clan_lib/tests/test_create.py | 2 +- pkgs/clan-vm-manager/clan_vm_manager/clan_uri.py | 2 +- pkgs/clan-vm-manager/clan_vm_manager/history.py | 2 +- pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py | 2 +- pkgs/clan-vm-manager/tests/test_clan_uri.py | 2 +- 40 files changed, 40 insertions(+), 39 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/__init__.py b/pkgs/clan-cli/clan_cli/__init__.py index e05d26ee6..4b6eec01b 100644 --- a/pkgs/clan-cli/clan_cli/__init__.py +++ b/pkgs/clan-cli/clan_cli/__init__.py @@ -15,7 +15,7 @@ from .clan import show, update __all__ = ["directory", "disk", "mdns_discovery", "modules", "update"] from clan_lib.errors import ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from . import ( backups, diff --git a/pkgs/clan-cli/clan_cli/clan/create.py b/pkgs/clan-cli/clan_cli/clan/create.py index 3e533ecfa..fe62ed652 100644 --- a/pkgs/clan-cli/clan_cli/clan/create.py +++ b/pkgs/clan-cli/clan_cli/clan/create.py @@ -6,7 +6,7 @@ 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.flake import Flake from clan_lib.nix_models.inventory import Inventory from clan_lib.persist.inventory_store import InventoryStore diff --git a/pkgs/clan-cli/clan_cli/clan/inspect.py b/pkgs/clan-cli/clan_cli/clan/inspect.py index 6f3cff1c3..11a654882 100644 --- a/pkgs/clan-cli/clan_cli/clan/inspect.py +++ b/pkgs/clan-cli/clan_cli/clan/inspect.py @@ -4,7 +4,7 @@ from pathlib import Path from typing import Any from clan_lib.errors import ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_cli.cmd import run from clan_cli.dirs import machine_gcroot diff --git a/pkgs/clan-cli/clan_cli/clan/show.py b/pkgs/clan-cli/clan_cli/clan/show.py index 5710893da..6aac94da7 100644 --- a/pkgs/clan-cli/clan_cli/clan/show.py +++ b/pkgs/clan-cli/clan_cli/clan/show.py @@ -6,7 +6,7 @@ from urllib.parse import urlparse from clan_lib.api import API from clan_lib.errors import ClanCmdError, ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_lib.nix_models.inventory import Meta from clan_cli.cmd import run diff --git a/pkgs/clan-cli/clan_cli/clan/update.py b/pkgs/clan-cli/clan_cli/clan/update.py index e29a1dbc4..77dcbed00 100644 --- a/pkgs/clan-cli/clan_cli/clan/update.py +++ b/pkgs/clan-cli/clan_cli/clan/update.py @@ -1,7 +1,7 @@ from dataclasses import dataclass from clan_lib.api import API -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_lib.nix_models.inventory import Inventory, Meta from clan_lib.persist.inventory_store import InventoryStore from clan_lib.persist.util import apply_patch diff --git a/pkgs/clan-cli/clan_cli/dirs.py b/pkgs/clan-cli/clan_cli/dirs.py index a170c0094..3b13d1b9e 100644 --- a/pkgs/clan-cli/clan_cli/dirs.py +++ b/pkgs/clan-cli/clan_cli/dirs.py @@ -9,7 +9,7 @@ from typing import TYPE_CHECKING from clan_lib.errors import ClanError if TYPE_CHECKING: - from clan_lib.flake.flake import Flake + from clan_lib.flake import Flake from clan_cli.machines.machines import Machine diff --git a/pkgs/clan-cli/clan_cli/flash/flash_cmd.py b/pkgs/clan-cli/clan_cli/flash/flash_cmd.py index 680de2a1d..b9533d86c 100644 --- a/pkgs/clan-cli/clan_cli/flash/flash_cmd.py +++ b/pkgs/clan-cli/clan_cli/flash/flash_cmd.py @@ -6,7 +6,7 @@ from dataclasses import dataclass from pathlib import Path from typing import Any -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_cli.completions import add_dynamic_completer, complete_machines from clan_cli.machines.machines import Machine diff --git a/pkgs/clan-cli/clan_cli/inventory/__init__.py b/pkgs/clan-cli/clan_cli/inventory/__init__.py index cfb4a44e9..80c054f5d 100644 --- a/pkgs/clan-cli/clan_cli/inventory/__init__.py +++ b/pkgs/clan-cli/clan_cli/inventory/__init__.py @@ -17,7 +17,7 @@ from typing import Any from clan_lib.api import API from clan_lib.errors import ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_lib.nix_models.inventory import Inventory from clan_lib.persist.inventory_store import WriteInfo from clan_lib.persist.util import ( diff --git a/pkgs/clan-cli/clan_cli/machines/create.py b/pkgs/clan-cli/clan_cli/machines/create.py index 3ebc21b59..1c93a97af 100644 --- a/pkgs/clan-cli/clan_cli/machines/create.py +++ b/pkgs/clan-cli/clan_cli/machines/create.py @@ -6,7 +6,7 @@ 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.flake import Flake from clan_lib.nix_models.inventory import ( Machine as InventoryMachine, ) diff --git a/pkgs/clan-cli/clan_cli/machines/list.py b/pkgs/clan-cli/clan_cli/machines/list.py index 28ff8d0d8..debcf3c0e 100644 --- a/pkgs/clan-cli/clan_cli/machines/list.py +++ b/pkgs/clan-cli/clan_cli/machines/list.py @@ -7,7 +7,7 @@ from clan_lib.api import API from clan_lib.api.disk import MachineDiskMatter from clan_lib.api.modules import parse_frontmatter from clan_lib.errors import ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_lib.nix_models.inventory import Machine as InventoryMachine from clan_lib.persist.inventory_store import InventoryStore diff --git a/pkgs/clan-cli/clan_cli/machines/machines.py b/pkgs/clan-cli/clan_cli/machines/machines.py index dd7929685..2ba76f001 100644 --- a/pkgs/clan-cli/clan_cli/machines/machines.py +++ b/pkgs/clan-cli/clan_cli/machines/machines.py @@ -10,7 +10,7 @@ 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_lib.flake import Flake from clan_cli.cmd import Log, RunOpts, run from clan_cli.facts import public_modules as facts_public_modules diff --git a/pkgs/clan-cli/clan_cli/machines/machines_test.py b/pkgs/clan-cli/clan_cli/machines/machines_test.py index 49e7f76ff..d6cd52122 100644 --- a/pkgs/clan-cli/clan_cli/machines/machines_test.py +++ b/pkgs/clan-cli/clan_cli/machines/machines_test.py @@ -1,5 +1,5 @@ import pytest -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_cli.machines.machines import Machine diff --git a/pkgs/clan-cli/clan_cli/machines/morph.py b/pkgs/clan-cli/clan_cli/machines/morph.py index c510523a9..30dc05351 100644 --- a/pkgs/clan-cli/clan_cli/machines/morph.py +++ b/pkgs/clan-cli/clan_cli/machines/morph.py @@ -8,7 +8,7 @@ from pathlib import Path from tempfile import TemporaryDirectory from clan_lib.errors import ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_lib.nix_models.inventory import Machine as InventoryMachine from clan_cli.cmd import Log, RunOpts, run diff --git a/pkgs/clan-cli/clan_cli/secrets/sops.py b/pkgs/clan-cli/clan_cli/secrets/sops.py index defa23788..6a718a35e 100644 --- a/pkgs/clan-cli/clan_cli/secrets/sops.py +++ b/pkgs/clan-cli/clan_cli/secrets/sops.py @@ -15,7 +15,7 @@ from typing import IO, Any from clan_lib.api import API from clan_lib.errors import ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_cli.cmd import Log, RunOpts, run from clan_cli.dirs import user_config_dir diff --git a/pkgs/clan-cli/clan_cli/select.py b/pkgs/clan-cli/clan_cli/select.py index 6eedf5c10..18cdbc306 100644 --- a/pkgs/clan-cli/clan_cli/select.py +++ b/pkgs/clan-cli/clan_cli/select.py @@ -1,7 +1,7 @@ import argparse import json -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake def select_command(args: argparse.Namespace) -> None: diff --git a/pkgs/clan-cli/clan_cli/templates.py b/pkgs/clan-cli/clan_cli/templates.py index 9ac18b164..96c8983ce 100644 --- a/pkgs/clan-cli/clan_cli/templates.py +++ b/pkgs/clan-cli/clan_cli/templates.py @@ -4,7 +4,7 @@ from pathlib import Path from typing import Any, Literal, NewType, TypedDict, cast from clan_lib.errors import ClanCmdError, ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_cli.cmd import run from clan_cli.dirs import clan_templates diff --git a/pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py b/pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py index 7e4538f42..70aa3e2b5 100644 --- a/pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py +++ b/pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py @@ -23,7 +23,7 @@ from clan_cli.tests import age_keys from clan_cli.tests.fixture_error import FixtureError from clan_cli.tests.root import CLAN_CORE from clan_cli.tests.temporary_dir import TEMPDIR -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake log = logging.getLogger(__name__) diff --git a/pkgs/clan-cli/clan_cli/tests/test_clan_nix_attrset.py b/pkgs/clan-cli/clan_cli/tests/test_clan_nix_attrset.py index 01a124172..7b48214db 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_clan_nix_attrset.py +++ b/pkgs/clan-cli/clan_cli/tests/test_clan_nix_attrset.py @@ -19,7 +19,7 @@ from clan_cli.templates import ( list_templates, ) from clan_cli.tests.fixtures_flakes import FlakeForTest -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake # Function to write clan attributes to a file diff --git a/pkgs/clan-cli/clan_cli/tests/test_flake_caching.py b/pkgs/clan-cli/clan_cli/tests/test_flake_caching.py index 5e231aa9a..734153f44 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_flake_caching.py +++ b/pkgs/clan-cli/clan_cli/tests/test_flake_caching.py @@ -348,7 +348,7 @@ def test_conditional_all_selector(flake: ClanFlake) -> None: def test_caching_works(flake: ClanFlake) -> None: from unittest.mock import patch - from clan_lib.flake.flake import Flake + from clan_lib.flake import Flake my_flake = Flake(str(flake.path)) diff --git a/pkgs/clan-cli/clan_cli/tests/test_inventory_serde.py b/pkgs/clan-cli/clan_cli/tests/test_inventory_serde.py index 332e494a4..d181715d8 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_inventory_serde.py +++ b/pkgs/clan-cli/clan_cli/tests/test_inventory_serde.py @@ -2,7 +2,7 @@ from typing import Any, cast import pytest from clan_cli.tests.fixtures_flakes import FlakeForTest -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_lib.persist.inventory_store import InventoryStore diff --git a/pkgs/clan-cli/clan_cli/tests/test_machines_cli.py b/pkgs/clan-cli/clan_cli/tests/test_machines_cli.py index 9af144bc8..5ffa08017 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_machines_cli.py +++ b/pkgs/clan-cli/clan_cli/tests/test_machines_cli.py @@ -5,7 +5,7 @@ from clan_cli.tests import fixtures_flakes from clan_cli.tests.age_keys import SopsSetup, assert_secrets_file_recipients from clan_cli.tests.helpers import cli from clan_cli.tests.stdout import CaptureOutput -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake @pytest.mark.impure diff --git a/pkgs/clan-cli/clan_cli/tests/test_modules.py b/pkgs/clan-cli/clan_cli/tests/test_modules.py index fac8841f6..69be97ee8 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_modules.py +++ b/pkgs/clan-cli/clan_cli/tests/test_modules.py @@ -7,7 +7,7 @@ from clan_cli.machines.create import CreateOptions, create_machine from clan_cli.nix import nix_eval, run from clan_cli.tests.fixtures_flakes import FlakeForTest from clan_lib.api.modules import list_modules -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_lib.nix_models.inventory import ( Inventory, Machine, diff --git a/pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py b/pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py index 5a3014b72..f1b3932ba 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py +++ b/pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py @@ -8,7 +8,7 @@ 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.flake import Flake +from clan_lib.flake import Flake if TYPE_CHECKING: from .age_keys import KeyPair diff --git a/pkgs/clan-cli/clan_cli/tests/test_vars.py b/pkgs/clan-cli/clan_cli/tests/test_vars.py index aa28fe2a8..80c083bc2 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_vars.py +++ b/pkgs/clan-cli/clan_cli/tests/test_vars.py @@ -23,7 +23,7 @@ from clan_cli.vars.public_modules import in_repo 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.flake import Flake +from clan_lib.flake import Flake def test_dependencies_as_files(temp_dir: Path) -> None: diff --git a/pkgs/clan-cli/clan_cli/tests/test_vars_deployment.py b/pkgs/clan-cli/clan_cli/tests/test_vars_deployment.py index cff5880b0..367bc5ed0 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_vars_deployment.py +++ b/pkgs/clan-cli/clan_cli/tests/test_vars_deployment.py @@ -12,7 +12,7 @@ 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.flake.flake import Flake +from clan_lib.flake import Flake @pytest.mark.impure diff --git a/pkgs/clan-cli/clan_cli/tests/test_vms_cli.py b/pkgs/clan-cli/clan_cli/tests/test_vms_cli.py index ae538338f..34df7d129 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_vms_cli.py +++ b/pkgs/clan-cli/clan_cli/tests/test_vms_cli.py @@ -7,7 +7,7 @@ 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.flake import Flake +from clan_lib.flake import Flake if TYPE_CHECKING: from .age_keys import KeyPair diff --git a/pkgs/clan-cli/clan_cli/vars/generate.py b/pkgs/clan-cli/clan_cli/vars/generate.py index 5890ea4ff..4a2b37685 100644 --- a/pkgs/clan-cli/clan_cli/vars/generate.py +++ b/pkgs/clan-cli/clan_cli/vars/generate.py @@ -22,7 +22,7 @@ from clan_cli.vars._types import StoreBase from clan_cli.vars.migration import check_can_migrate, migrate_files from clan_lib.api import API from clan_lib.errors import ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from .check import check_vars from .graph import ( diff --git a/pkgs/clan-cli/clan_cli/vars/get.py b/pkgs/clan-cli/clan_cli/vars/get.py index 47cc839f9..c95de5fb3 100644 --- a/pkgs/clan-cli/clan_cli/vars/get.py +++ b/pkgs/clan-cli/clan_cli/vars/get.py @@ -5,7 +5,7 @@ import sys from clan_cli.completions import add_dynamic_completer, complete_machines from clan_lib.api import API from clan_lib.errors import ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from .generate import Var from .list import get_vars diff --git a/pkgs/clan-cli/clan_cli/vars/list.py b/pkgs/clan-cli/clan_cli/vars/list.py index 15fb00c3f..87e07f4d1 100644 --- a/pkgs/clan-cli/clan_cli/vars/list.py +++ b/pkgs/clan-cli/clan_cli/vars/list.py @@ -5,7 +5,7 @@ from clan_cli.completions import add_dynamic_completer, complete_machines from clan_cli.machines.machines import Machine from clan_lib.api import API from clan_lib.errors import ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from ._types import GeneratorUpdate from .generate import Generator, Prompt, Var, execute_generator diff --git a/pkgs/clan-cli/clan_cli/vars/set.py b/pkgs/clan-cli/clan_cli/vars/set.py index 131ab59f9..6de27c9fe 100644 --- a/pkgs/clan-cli/clan_cli/vars/set.py +++ b/pkgs/clan-cli/clan_cli/vars/set.py @@ -7,7 +7,7 @@ from clan_cli.git import commit_files from clan_cli.machines.machines import Machine from clan_cli.vars.get import get_var from clan_cli.vars.prompt import PromptType -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from .generate import Var from .prompt import ask diff --git a/pkgs/clan-cli/clan_cli/vms/inspect.py b/pkgs/clan-cli/clan_cli/vms/inspect.py index 1523ad67a..320b96b9b 100644 --- a/pkgs/clan-cli/clan_cli/vms/inspect.py +++ b/pkgs/clan-cli/clan_cli/vms/inspect.py @@ -4,7 +4,7 @@ from dataclasses import dataclass from pathlib import Path from typing import Any -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_cli.completions import add_dynamic_completer, complete_machines from clan_cli.machines.machines import Machine diff --git a/pkgs/clan-cli/clan_lib/api/directory.py b/pkgs/clan-cli/clan_lib/api/directory.py index e24b15618..131b02524 100644 --- a/pkgs/clan-cli/clan_lib/api/directory.py +++ b/pkgs/clan-cli/clan_lib/api/directory.py @@ -8,7 +8,7 @@ from clan_cli.cmd import RunOpts, run from clan_cli.nix import nix_shell from clan_lib.errors import ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from . import API diff --git a/pkgs/clan-cli/clan_lib/api/modules.py b/pkgs/clan-cli/clan_lib/api/modules.py index f2bdad518..aceb7cc97 100644 --- a/pkgs/clan-cli/clan_lib/api/modules.py +++ b/pkgs/clan-cli/clan_lib/api/modules.py @@ -5,7 +5,7 @@ from pathlib import Path from typing import Any, TypedDict from clan_lib.errors import ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from . import API diff --git a/pkgs/clan-cli/clan_lib/flake/__init__.py b/pkgs/clan-cli/clan_lib/flake/__init__.py index e69de29bb..68e040f67 100644 --- a/pkgs/clan-cli/clan_lib/flake/__init__.py +++ b/pkgs/clan-cli/clan_lib/flake/__init__.py @@ -0,0 +1 @@ +from .flake import Flake # noqa diff --git a/pkgs/clan-cli/clan_lib/persist/inventory_store.py b/pkgs/clan-cli/clan_lib/persist/inventory_store.py index 01763913f..a336050c9 100644 --- a/pkgs/clan-cli/clan_lib/persist/inventory_store.py +++ b/pkgs/clan-cli/clan_lib/persist/inventory_store.py @@ -4,7 +4,7 @@ from dataclasses import dataclass from clan_cli.git import commit_file from clan_lib.errors import ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_lib.nix_models.inventory import Inventory from .util import ( diff --git a/pkgs/clan-cli/clan_lib/tests/test_create.py b/pkgs/clan-cli/clan_lib/tests/test_create.py index c05c5b3b8..515b98217 100644 --- a/pkgs/clan-cli/clan_lib/tests/test_create.py +++ b/pkgs/clan-cli/clan_lib/tests/test_create.py @@ -25,7 +25,7 @@ from clan_cli.vars.generate import generate_vars_for_machine, get_generators_clo from clan_lib.api.disk import hw_main_disk_options, set_machine_disk_schema from clan_lib.api.network import check_machine_online from clan_lib.errors import ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_lib.nix_models.inventory import Machine as InventoryMachine from clan_lib.nix_models.inventory import MachineDeploy diff --git a/pkgs/clan-vm-manager/clan_vm_manager/clan_uri.py b/pkgs/clan-vm-manager/clan_vm_manager/clan_uri.py index d971eb2e5..14f2c5549 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/clan_uri.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/clan_uri.py @@ -4,7 +4,7 @@ import urllib.request from dataclasses import dataclass from pathlib import Path -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake # Define the ClanURI class diff --git a/pkgs/clan-vm-manager/clan_vm_manager/history.py b/pkgs/clan-vm-manager/clan_vm_manager/history.py index a39b93e30..9dd5c5241 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/history.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/history.py @@ -10,7 +10,7 @@ from clan_cli.dirs import user_history_file from clan_cli.locked_open import read_history_file, write_history_file from clan_cli.machines.list import list_machines from clan_lib.errors import ClanError -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_vm_manager.clan_uri import ClanURI diff --git a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py index 985afe388..85bab2685 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py @@ -5,7 +5,7 @@ from typing import Any, ClassVar import gi from clan_cli.machines.machines import Machine -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_vm_manager import assets from clan_vm_manager.clan_uri import ClanURI diff --git a/pkgs/clan-vm-manager/tests/test_clan_uri.py b/pkgs/clan-vm-manager/tests/test_clan_uri.py index e0793b96c..dff29cdf6 100644 --- a/pkgs/clan-vm-manager/tests/test_clan_uri.py +++ b/pkgs/clan-vm-manager/tests/test_clan_uri.py @@ -2,7 +2,7 @@ from pathlib import Path import pytest from clan_cli.tests.fixtures_flakes import ClanFlake -from clan_lib.flake.flake import Flake +from clan_lib.flake import Flake from clan_vm_manager.clan_uri import ClanURI