From 7076f1b0e6c14a20da176d084413cd1bba5c88a6 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 23 Apr 2025 16:53:11 +0200 Subject: [PATCH] Chore(clan/clan_uri): Remove ClanURI class from clan_cli --- pkgs/clan-cli/clan_cli/completions.py | 2 +- pkgs/clan-cli/clan_cli/machines/delete.py | 3 +-- .../clan_cli => clan-vm-manager/clan_vm_manager}/clan_uri.py | 0 pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py | 2 +- pkgs/clan-vm-manager/clan_vm_manager/history.py | 3 ++- pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py | 2 +- pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py | 2 +- pkgs/clan-vm-manager/clan_vm_manager/views/list.py | 2 +- .../clan_cli => clan-vm-manager}/tests/test_clan_uri.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename pkgs/{clan-cli/clan_cli => clan-vm-manager/clan_vm_manager}/clan_uri.py (100%) rename pkgs/{clan-cli/clan_cli => clan-vm-manager}/tests/test_clan_uri.py (98%) diff --git a/pkgs/clan-cli/clan_cli/completions.py b/pkgs/clan-cli/clan_cli/completions.py index 30e329089..d14783091 100644 --- a/pkgs/clan-cli/clan_cli/completions.py +++ b/pkgs/clan-cli/clan_cli/completions.py @@ -207,7 +207,7 @@ def complete_secrets( """ Provides completion functionality for clan secrets """ - from .clan_uri import Flake + from . import Flake from .secrets.secrets import list_secrets flake = clan_dir_result if (clan_dir_result := clan_dir(None)) is not None else "." diff --git a/pkgs/clan-cli/clan_cli/machines/delete.py b/pkgs/clan-cli/clan_cli/machines/delete.py index efef4d970..1522b5001 100644 --- a/pkgs/clan-cli/clan_cli/machines/delete.py +++ b/pkgs/clan-cli/clan_cli/machines/delete.py @@ -3,9 +3,8 @@ import logging import shutil from pathlib import Path -from clan_cli import inventory +from clan_cli import Flake, inventory from clan_cli.api import API -from clan_cli.clan_uri import Flake from clan_cli.completions import add_dynamic_completer, complete_machines from clan_cli.dirs import specific_machine_dir from clan_cli.secrets.folders import sops_secrets_folder diff --git a/pkgs/clan-cli/clan_cli/clan_uri.py b/pkgs/clan-vm-manager/clan_vm_manager/clan_uri.py similarity index 100% rename from pkgs/clan-cli/clan_cli/clan_uri.py rename to pkgs/clan-vm-manager/clan_vm_manager/clan_uri.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py b/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py index 741d0fcb3..bceba2fed 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py @@ -13,12 +13,12 @@ from typing import IO, ClassVar import gi from clan_cli import vms -from clan_cli.clan_uri import ClanURI from clan_cli.dirs import vm_state_dir from clan_cli.machines.machines import Machine from clan_cli.vms.inspect import inspect_vm from clan_cli.vms.qemu import QMPWrapper +from clan_vm_manager.clan_uri import ClanURI from clan_vm_manager.components.executor import MPProcess, spawn from clan_vm_manager.history import HistoryEntry from clan_vm_manager.singletons.toast import ( diff --git a/pkgs/clan-vm-manager/clan_vm_manager/history.py b/pkgs/clan-vm-manager/clan_vm_manager/history.py index 566cd2a44..f2f7421d0 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/history.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/history.py @@ -6,12 +6,13 @@ import logging from typing import Any from clan_cli.clan.inspect import FlakeConfig, inspect_flake -from clan_cli.clan_uri import ClanURI from clan_cli.dirs import user_history_file from clan_cli.errors import ClanError from clan_cli.locked_open import read_history_file, write_history_file from clan_cli.machines.list import list_nixos_machines +from clan_vm_manager.clan_uri import ClanURI + log = logging.getLogger(__name__) diff --git a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py index d8fc062da..1dc0097a0 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py @@ -4,9 +4,9 @@ from collections.abc import Callable from typing import Any, ClassVar, cast import gi -from clan_cli.clan_uri import ClanURI from clan_cli.machines.machines import Machine +from clan_vm_manager.clan_uri import ClanURI from clan_vm_manager.components.gkvstore import GKVStore from clan_vm_manager.history import HistoryEntry, add_history from clan_vm_manager.singletons.use_vms import ClanStore 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 5725ffc30..9020128b3 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 @@ -4,11 +4,11 @@ from pathlib import Path from typing import Any, ClassVar import gi -from clan_cli.clan_uri import ClanURI from clan_cli.flake import Flake from clan_cli.machines.machines import Machine from clan_vm_manager import assets +from clan_vm_manager.clan_uri import ClanURI from clan_vm_manager.components.gkvstore import GKVStore from clan_vm_manager.components.vmobj import VMObject from clan_vm_manager.history import HistoryEntry diff --git a/pkgs/clan-vm-manager/clan_vm_manager/views/list.py b/pkgs/clan-vm-manager/clan_vm_manager/views/list.py index 762010fcc..11c648553 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/views/list.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/views/list.py @@ -5,9 +5,9 @@ from functools import partial from typing import Any, TypeVar import gi -from clan_cli.clan_uri import ClanURI from clan_cli.errors import ClanError +from clan_vm_manager.clan_uri import ClanURI from clan_vm_manager.components.gkvstore import GKVStore from clan_vm_manager.components.interfaces import ClanConfig from clan_vm_manager.components.list_splash import EmptySplash diff --git a/pkgs/clan-cli/clan_cli/tests/test_clan_uri.py b/pkgs/clan-vm-manager/tests/test_clan_uri.py similarity index 98% rename from pkgs/clan-cli/clan_cli/tests/test_clan_uri.py rename to pkgs/clan-vm-manager/tests/test_clan_uri.py index 34049e0b0..5f456608f 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_clan_uri.py +++ b/pkgs/clan-vm-manager/tests/test_clan_uri.py @@ -1,9 +1,9 @@ from pathlib import Path import pytest -from clan_cli.clan_uri import ClanURI from clan_cli.flake import Flake from clan_cli.tests.fixtures_flakes import ClanFlake +from clan_vm_manager.clan_uri import ClanURI def test_get_url() -> None: