From 9063e4aae9ae6b4d61d02d5334c3df527dcc7a91 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 20 May 2025 12:52:12 +0200 Subject: [PATCH] clan-cli: clan_cli.colors -> clan_lib.colors --- pkgs/clan-cli/clan_cli/custom_logger.py | 2 +- pkgs/clan-cli/clan_cli/machines/update.py | 2 +- pkgs/clan-cli/clan_cli/ssh/host.py | 2 +- pkgs/clan-cli/clan_lib/cmd/__init__.py | 2 +- .../{clan_cli/colors.py => clan_lib/colors/__init__.py} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/clan-cli/{clan_cli/colors.py => clan_lib/colors/__init__.py} (100%) diff --git a/pkgs/clan-cli/clan_cli/custom_logger.py b/pkgs/clan-cli/clan_cli/custom_logger.py index 1377ec81f..16f0cceb6 100644 --- a/pkgs/clan-cli/clan_cli/custom_logger.py +++ b/pkgs/clan-cli/clan_cli/custom_logger.py @@ -4,7 +4,7 @@ import os import sys from pathlib import Path -from clan_cli.colors import AnsiColor, RgbColor, color_by_tuple +from clan_lib.colors import AnsiColor, RgbColor, color_by_tuple # https://no-color.org DISABLE_COLOR = not sys.stderr.isatty() or os.environ.get("NO_COLOR", "") != "" diff --git a/pkgs/clan-cli/clan_cli/machines/update.py b/pkgs/clan-cli/clan_cli/machines/update.py index a32d55deb..6efcebf92 100644 --- a/pkgs/clan-cli/clan_cli/machines/update.py +++ b/pkgs/clan-cli/clan_cli/machines/update.py @@ -9,11 +9,11 @@ from contextlib import ExitStack from clan_lib.api import API from clan_lib.cmd import Log, MsgColor, RunOpts, run +from clan_lib.colors import AnsiColor from clan_lib.errors import ClanError from clan_lib.nix import nix_command, nix_config, nix_metadata from clan_cli.async_run import AsyncContext, AsyncOpts, AsyncRuntime, is_async_cancelled -from clan_cli.colors import AnsiColor from clan_cli.completions import ( add_dynamic_completer, complete_machines, diff --git a/pkgs/clan-cli/clan_cli/ssh/host.py b/pkgs/clan-cli/clan_cli/ssh/host.py index 39acea75f..c02b764e8 100644 --- a/pkgs/clan-cli/clan_cli/ssh/host.py +++ b/pkgs/clan-cli/clan_cli/ssh/host.py @@ -14,10 +14,10 @@ from tempfile import TemporaryDirectory from typing import Any from clan_lib.cmd import CmdOut, RunOpts, run +from clan_lib.colors import AnsiColor from clan_lib.errors import ClanError from clan_lib.nix import nix_shell -from clan_cli.colors import AnsiColor from clan_cli.ssh.host_key import HostKeyCheck cmdlog = logging.getLogger(__name__) diff --git a/pkgs/clan-cli/clan_lib/cmd/__init__.py b/pkgs/clan-cli/clan_lib/cmd/__init__.py index f0cbc3c3c..7eb727e43 100644 --- a/pkgs/clan-cli/clan_lib/cmd/__init__.py +++ b/pkgs/clan-cli/clan_lib/cmd/__init__.py @@ -19,9 +19,9 @@ from pathlib import Path from typing import IO, Any from clan_cli.async_run import get_async_ctx, is_async_cancelled -from clan_cli.colors import Color from clan_cli.custom_logger import print_trace +from clan_lib.colors import Color from clan_lib.errors import ClanCmdError, ClanError, CmdOut, indent_command cmdlog = logging.getLogger(__name__) diff --git a/pkgs/clan-cli/clan_cli/colors.py b/pkgs/clan-cli/clan_lib/colors/__init__.py similarity index 100% rename from pkgs/clan-cli/clan_cli/colors.py rename to pkgs/clan-cli/clan_lib/colors/__init__.py