yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make all same-module imports relative, the rest absolute

Browse Source 
This makes sorting more consitent.
This commit is contained in:
Jörg Thalheim
2024-09-02 12:55:07 +02:00
parent 34992d5519
commit af4b9cc2d5
56 changed files with 196 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/clan-cli/clan_cli/machines/create.py
View File

@@ -2,10 +2,10 @@ import argparse
import logging
import re
from ..api import API
from ..clan_uri import FlakeId
from ..errors import ClanError
from ..inventory import (
from clan_cli.api import API
from clan_cli.clan_uri import FlakeId
from clan_cli.errors import ClanError
from clan_cli.inventory import (
Machine,
MachineDeploy,
load_inventory_eval,

12
pkgs/clan-cli/clan_cli/machines/delete.py
View File

@@ -1,12 +1,12 @@
import argparse
import shutil
from ..api import API
from ..clan_uri import FlakeId
from ..completions import add_dynamic_completer, complete_machines
from ..dirs import specific_machine_dir
from ..errors import ClanError
from ..inventory import load_inventory_json, save_inventory
from clan_cli.api import API
from clan_cli.clan_uri import FlakeId
from clan_cli.completions import add_dynamic_completer, complete_machines
from clan_cli.dirs import specific_machine_dir
from clan_cli.errors import ClanError
from clan_cli.inventory import load_inventory_json, save_inventory
@API.register

2
pkgs/clan-cli/clan_cli/machines/facts.py
View File

@@ -1,6 +1,6 @@
from pathlib import Path
from ..dirs import specific_machine_dir
from clan_cli.dirs import specific_machine_dir
def machine_has_fact(flake_dir: Path, machine: str, fact: str) -> bool:

8
pkgs/clan-cli/clan_cli/machines/hardware.py
View File

@@ -7,13 +7,13 @@ from typing import Literal
from clan_cli.api import API
from clan_cli.clan_uri import FlakeId
from clan_cli.cmd import run, run_no_stdout
from clan_cli.completions import add_dynamic_completer, complete_machines
from clan_cli.errors import ClanCmdError, ClanError
from clan_cli.git import commit_file
from clan_cli.machines.machines import Machine
from clan_cli.nix import nix_config, nix_eval, nix_shell
from ..cmd import run, run_no_stdout
from ..completions import add_dynamic_completer, complete_machines
from ..machines.machines import Machine
from ..nix import nix_config, nix_eval, nix_shell
from .types import machine_name_type
log = logging.getLogger(__name__)

15
pkgs/clan-cli/clan_cli/machines/install.py
View File

@@ -8,14 +8,13 @@ from pathlib import Path
from tempfile import TemporaryDirectory
from clan_cli.api import API
from ..clan_uri import FlakeId
from ..cmd import Log, run
from ..completions import add_dynamic_completer, complete_machines
from ..facts.generate import generate_facts
from ..machines.machines import Machine
from ..nix import nix_shell
from ..ssh.cli import is_ipv6, is_reachable, qrcode_scan
from clan_cli.clan_uri import FlakeId
from clan_cli.cmd import Log, run
from clan_cli.completions import add_dynamic_completer, complete_machines
from clan_cli.facts.generate import generate_facts
from clan_cli.machines.machines import Machine
from clan_cli.nix import nix_shell
from clan_cli.ssh.cli import is_ipv6, is_reachable, qrcode_scan
log = logging.getLogger(__name__)

7
pkgs/clan-cli/clan_cli/machines/inventory.py
View File

@@ -1,9 +1,10 @@
import json
from pathlib import Path
from ..clan_uri import FlakeId
from ..cmd import run
from ..nix import nix_build, nix_config
from clan_cli.clan_uri import FlakeId
from clan_cli.cmd import run
from clan_cli.nix import nix_build, nix_config
from .machines import Machine

3
pkgs/clan-cli/clan_cli/machines/machine_group.py
View File

@@ -1,7 +1,8 @@
from collections.abc import Callable
from typing import TypeVar
from ..ssh import Host, HostGroup, HostResult
from clan_cli.ssh import Host, HostGroup, HostResult
from .machines import Machine
T = TypeVar("T")

9
pkgs/clan-cli/clan_cli/machines/machines.py
View File

@@ -6,11 +6,10 @@ from tempfile import NamedTemporaryFile
from typing import Any
from clan_cli.clan_uri import FlakeId
from ..cmd import run_no_stdout
from ..errors import ClanError
from ..nix import nix_build, nix_config, nix_eval, nix_metadata
from ..ssh import Host, parse_deployment_address
from clan_cli.cmd import run_no_stdout
from clan_cli.errors import ClanError
from clan_cli.nix import nix_build, nix_config, nix_eval, nix_metadata
from clan_cli.ssh import Host, parse_deployment_address
log = logging.getLogger(__name__)

20
pkgs/clan-cli/clan_cli/machines/update.py
View File

@@ -7,17 +7,17 @@ import sys
from clan_cli.api import API
from clan_cli.clan_uri import FlakeId
from clan_cli.cmd import run
from clan_cli.completions import add_dynamic_completer, complete_machines
from clan_cli.errors import ClanError
from clan_cli.facts.generate import generate_facts
from clan_cli.facts.upload import upload_secrets
from clan_cli.inventory import Machine as InventoryMachine
from clan_cli.machines.machines import Machine
from clan_cli.nix import nix_command, nix_metadata
from clan_cli.ssh import HostKeyCheck
from clan_cli.vars.generate import generate_vars
from ..cmd import run
from ..completions import add_dynamic_completer, complete_machines
from ..errors import ClanError
from ..facts.generate import generate_facts
from ..facts.upload import upload_secrets
from ..inventory import Machine as InventoryMachine
from ..machines.machines import Machine
from ..nix import nix_command, nix_metadata
from ..ssh import HostKeyCheck
from ..vars.generate import generate_vars
from .inventory import get_all_machines, get_selected_machines
from .machine_group import MachineGroup