From 308929632888d7aa1f8c56d531cea1641c068fa7 Mon Sep 17 00:00:00 2001
From: DavHau <d.hauer.it@gmail.com>
Date: Fri, 6 Sep 2024 15:24:50 +0200
Subject: [PATCH] clan-cli: fix cyclic import problem

---
 pkgs/clan-app/tests/conftest.py                     | 2 ++
 pkgs/clan-cli/clan_cli/__init__.py                  | 4 ++--
 pkgs/clan-cli/clan_cli/machines/machines.py         | 2 --
 pkgs/clan-cli/clan_cli/vars/_types.py               | 5 ++---
 pkgs/clan-cli/clan_cli/vars/{__init__.py => cli.py} | 0
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename pkgs/clan-cli/clan_cli/vars/{__init__.py => cli.py} (100%)

diff --git a/pkgs/clan-app/tests/conftest.py b/pkgs/clan-app/tests/conftest.py
index 9f107889f..530f4ad1c 100644
--- a/pkgs/clan-app/tests/conftest.py
+++ b/pkgs/clan-app/tests/conftest.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import subprocess
 from pathlib import Path
 
diff --git a/pkgs/clan-cli/clan_cli/__init__.py b/pkgs/clan-cli/clan_cli/__init__.py
index a8e423349..80cd932dc 100644
--- a/pkgs/clan-cli/clan_cli/__init__.py
+++ b/pkgs/clan-cli/clan_cli/__init__.py
@@ -20,7 +20,6 @@ from . import (
     history,
     secrets,
     state,
-    vars,
     vms,
 )
 from .clan_uri import FlakeId
@@ -32,6 +31,7 @@ from .hyperlink import help_hyperlink
 from .machines import cli as machines
 from .profiler import profile
 from .ssh import cli as ssh_cli
+from .vars import cli as vars_cli
 
 log = logging.getLogger(__name__)
 
@@ -293,7 +293,7 @@ For more detailed information, visit: {help_hyperlink("secrets", "https://docs.c
         ),
         formatter_class=argparse.RawTextHelpFormatter,
     )
-    vars.register_parser(parser_vars)
+    vars_cli.register_parser(parser_vars)
 
     parser_machine = subparsers.add_parser(
         "machines",
diff --git a/pkgs/clan-cli/clan_cli/machines/machines.py b/pkgs/clan-cli/clan_cli/machines/machines.py
index 7302e2b4d..9eb2b2849 100644
--- a/pkgs/clan-cli/clan_cli/machines/machines.py
+++ b/pkgs/clan-cli/clan_cli/machines/machines.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import importlib
 import json
 import logging
diff --git a/pkgs/clan-cli/clan_cli/vars/_types.py b/pkgs/clan-cli/clan_cli/vars/_types.py
index 37ab5ee5f..b09286945 100644
--- a/pkgs/clan-cli/clan_cli/vars/_types.py
+++ b/pkgs/clan-cli/clan_cli/vars/_types.py
@@ -1,11 +1,10 @@
-# !/usr/bin/env python3
 import json
 import shutil
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from pathlib import Path
 
-from clan_cli.machines.machines import Machine
+from clan_cli.machines import machines
 
 
 @dataclass
@@ -73,7 +72,7 @@ class Var:
 
 
 class StoreBase(ABC):
-    def __init__(self, machine: Machine) -> None:
+    def __init__(self, machine: "machines.Machine") -> None:
         self.machine = machine
 
     @property
diff --git a/pkgs/clan-cli/clan_cli/vars/__init__.py b/pkgs/clan-cli/clan_cli/vars/cli.py
similarity index 100%
rename from pkgs/clan-cli/clan_cli/vars/__init__.py
rename to pkgs/clan-cli/clan_cli/vars/cli.py