diff --git a/pkgs/clan-app/clan_app/app.py b/pkgs/clan-app/clan_app/app.py index 063e5e9b9..e8179af6d 100644 --- a/pkgs/clan-app/clan_app/app.py +++ b/pkgs/clan-app/clan_app/app.py @@ -7,8 +7,8 @@ import os from dataclasses import dataclass from pathlib import Path -from clan_cli.custom_logger import setup_logging from clan_lib.api import API, ErrorDataClass, SuccessDataClass +from clan_lib.custom_logger import setup_logging from clan_app.api.file_gtk import open_file from clan_app.deps.webview.webview import Size, SizeHint, Webview diff --git a/pkgs/clan-app/tests/conftest.py b/pkgs/clan-app/tests/conftest.py index 21e30af95..a9edb0832 100644 --- a/pkgs/clan-app/tests/conftest.py +++ b/pkgs/clan-app/tests/conftest.py @@ -5,7 +5,7 @@ import subprocess from pathlib import Path import pytest -from clan_cli.custom_logger import setup_logging +from clan_lib.custom_logger import setup_logging from clan_lib.nix import nix_shell pytest_plugins = [ diff --git a/pkgs/clan-app/tests/helpers/cli.py b/pkgs/clan-app/tests/helpers/cli.py index 3bd1f5f62..cddfea6df 100644 --- a/pkgs/clan-app/tests/helpers/cli.py +++ b/pkgs/clan-app/tests/helpers/cli.py @@ -3,7 +3,7 @@ import os import shlex from clan_app import main -from clan_cli.custom_logger import get_callers +from clan_lib.custom_logger import get_callers log = logging.getLogger(__name__) diff --git a/pkgs/clan-cli/clan_cli/__init__.py b/pkgs/clan-cli/clan_cli/__init__.py index 6d685e217..b95c5baa1 100644 --- a/pkgs/clan-cli/clan_cli/__init__.py +++ b/pkgs/clan-cli/clan_cli/__init__.py @@ -14,6 +14,7 @@ from .clan import show, update # API endpoints that are not used in the cli. __all__ = ["directory", "disk", "mdns_discovery", "modules", "update"] +from clan_lib.custom_logger import setup_logging from clan_lib.dirs import get_clan_flake_toplevel_or_env from clan_lib.errors import ClanError from clan_lib.flake import Flake @@ -26,7 +27,6 @@ from . import ( state, vms, ) -from .custom_logger import setup_logging from .facts import cli as facts from .flash import cli as flash_cli from .hyperlink import help_hyperlink diff --git a/pkgs/clan-cli/clan_cli/tests/helpers/cli.py b/pkgs/clan-cli/clan_cli/tests/helpers/cli.py index 2e9e1dd91..1b180da9e 100644 --- a/pkgs/clan-cli/clan_cli/tests/helpers/cli.py +++ b/pkgs/clan-cli/clan_cli/tests/helpers/cli.py @@ -3,7 +3,7 @@ import logging import shlex from clan_cli import create_parser -from clan_cli.custom_logger import print_trace +from clan_lib.custom_logger import print_trace log = logging.getLogger(__name__) diff --git a/pkgs/clan-cli/clan_lib/cmd/__init__.py b/pkgs/clan-cli/clan_lib/cmd/__init__.py index edf493b72..a5f131654 100644 --- a/pkgs/clan-cli/clan_lib/cmd/__init__.py +++ b/pkgs/clan-cli/clan_lib/cmd/__init__.py @@ -18,10 +18,9 @@ from enum import Enum from pathlib import Path from typing import IO, Any -from clan_cli.custom_logger import print_trace - from clan_lib.async_run import get_async_ctx, is_async_cancelled from clan_lib.colors import Color +from clan_lib.custom_logger import print_trace from clan_lib.errors import ClanCmdError, ClanError, CmdOut, indent_command cmdlog = logging.getLogger(__name__) diff --git a/pkgs/clan-cli/clan_cli/custom_logger.py b/pkgs/clan-cli/clan_lib/custom_logger/__init__.py similarity index 100% rename from pkgs/clan-cli/clan_cli/custom_logger.py rename to pkgs/clan-cli/clan_lib/custom_logger/__init__.py diff --git a/pkgs/clan-cli/conftest.py b/pkgs/clan-cli/conftest.py index 16b11874d..5bb8d63d2 100644 --- a/pkgs/clan-cli/conftest.py +++ b/pkgs/clan-cli/conftest.py @@ -1,7 +1,7 @@ import logging import pytest -from clan_cli.custom_logger import setup_logging +from clan_lib.custom_logger import setup_logging # Every fixture registered here will be available in clan_cli and clan_lib pytest_plugins = [ diff --git a/pkgs/clan-vm-manager/clan_vm_manager/app.py b/pkgs/clan-vm-manager/clan_vm_manager/app.py index 4aaab58f4..beb57df5f 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/app.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/app.py @@ -10,7 +10,7 @@ from clan_vm_manager.singletons.toast import InfoToast, ToastOverlay gi.require_version("Gtk", "4.0") gi.require_version("Adw", "1") -from clan_cli.custom_logger import setup_logging +from clan_lib.custom_logger import setup_logging from gi.repository import Adw, Gdk, Gio, Gtk from clan_vm_manager.components.interfaces import ClanConfig diff --git a/pkgs/clan-vm-manager/tests/conftest.py b/pkgs/clan-vm-manager/tests/conftest.py index 27154d15b..8252cfc1a 100644 --- a/pkgs/clan-vm-manager/tests/conftest.py +++ b/pkgs/clan-vm-manager/tests/conftest.py @@ -4,7 +4,7 @@ import sys from pathlib import Path import pytest -from clan_cli.custom_logger import setup_logging +from clan_lib.custom_logger import setup_logging from clan_lib.nix import nix_shell sys.path.append(str(Path(__file__).parent / "helpers")) diff --git a/pkgs/clan-vm-manager/tests/helpers/cli.py b/pkgs/clan-vm-manager/tests/helpers/cli.py index 9f95e4abc..aa0baee89 100644 --- a/pkgs/clan-vm-manager/tests/helpers/cli.py +++ b/pkgs/clan-vm-manager/tests/helpers/cli.py @@ -2,7 +2,7 @@ import logging import os import shlex -from clan_cli.custom_logger import get_callers +from clan_lib.custom_logger import get_callers from clan_vm_manager import main log = logging.getLogger(__name__)