clan_cli: move flake class to clan_lib

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

@@ -16,7 +16,6 @@ from clan_cli.dirs import (
     nixpkgs_source,
     specific_machine_dir,
 )
-from clan_cli.flake import Flake
 from clan_cli.locked_open import locked_open
 from clan_cli.machines.machines import Machine
 from clan_cli.nix import nix_test_store
@@ -24,6 +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
 
 log = logging.getLogger(__name__)
 

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

@@ -6,7 +6,6 @@ from typing import Any
 
 import pytest
 from clan_cli.cmd import run
-from clan_cli.flake import Flake
 from clan_cli.git import commit_file
 from clan_cli.locked_open import locked_open
 from clan_cli.nix import nix_command
@@ -20,6 +19,7 @@ from clan_cli.templates import (
     list_templates,
 )
 from clan_cli.tests.fixtures_flakes import FlakeForTest
+from clan_lib.flake.flake import Flake
 
 
 # Function to write clan attributes to a file

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

@@ -1,14 +1,14 @@
 import logging
 
 import pytest
-from clan_cli.flake import (
+from clan_cli.tests.fixtures_flakes import ClanFlake
+from clan_lib.flake.flake import (
     Flake,
     FlakeCache,
     FlakeCacheEntry,
     parse_selector,
     selectors_as_dict,
 )
-from clan_cli.tests.fixtures_flakes import ClanFlake
 
 log = logging.getLogger(__name__)
 
@@ -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_cli.flake import Flake
+    from clan_lib.flake.flake import Flake
 
     my_flake = Flake(str(flake.path))
 

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

@@ -1,8 +1,8 @@
 from typing import Any, cast
 
 import pytest
-from clan_cli.flake import Flake
 from clan_cli.tests.fixtures_flakes import FlakeForTest
+from clan_lib.flake.flake import Flake
 from clan_lib.persist.inventory_store import InventoryStore
 
 

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

@@ -1,11 +1,11 @@
 import pytest
-from clan_cli.flake import Flake
 from clan_cli.inventory import load_inventory_json
 from clan_cli.secrets.folders import sops_machines_folder
 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
 
 
 @pytest.mark.impure

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

@@ -3,11 +3,11 @@ import subprocess
 from typing import TYPE_CHECKING
 
 import pytest
-from clan_cli.flake import Flake
 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.nix_models.inventory import (
     Inventory,
     Machine,

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

@@ -3,12 +3,12 @@ from typing import TYPE_CHECKING
 
 import pytest
 from clan_cli.facts.secret_modules.sops import SecretStore
-from clan_cli.flake import Flake
 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.flake import Flake
 
 if TYPE_CHECKING:
     from .age_keys import KeyPair

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

@@ -5,7 +5,6 @@ from pathlib import Path
 
 import pytest
 from clan_cli.errors import ClanError
-from clan_cli.flake import Flake
 from clan_cli.machines.machines import Machine
 from clan_cli.nix import nix_eval, run
 from clan_cli.tests.age_keys import SopsSetup
@@ -24,6 +23,7 @@ from clan_cli.vars.list import stringify_all_vars
 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.flake.flake import Flake
 
 
 def test_dependencies_as_files(temp_dir: Path) -> None:

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

@@ -5,7 +5,6 @@ from contextlib import ExitStack
 
 import pytest
 from clan_cli import cmd
-from clan_cli.flake import Flake
 from clan_cli.machines.machines import Machine
 from clan_cli.nix import nix_eval, run
 from clan_cli.tests.age_keys import SopsSetup
@@ -13,6 +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
 
 
 @pytest.mark.impure

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

@@ -2,12 +2,12 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 
 import pytest
-from clan_cli.flake import Flake
 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.flake import Flake
 
 if TYPE_CHECKING:
     from .age_keys import KeyPair