From e6c97786dc2d1347b737024ecb6acd3ea1093cc3 Mon Sep 17 00:00:00 2001 From: cliffmccarthy <16453869+cliffmccarthy@users.noreply.github.com> Date: Thu, 23 Oct 2025 09:10:47 -0500 Subject: [PATCH] refactor: Move all imports to top of cmdeploy/__init__.py --- cmdeploy/src/cmdeploy/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmdeploy/src/cmdeploy/__init__.py b/cmdeploy/src/cmdeploy/__init__.py index 50977905..db049431 100644 --- a/cmdeploy/src/cmdeploy/__init__.py +++ b/cmdeploy/src/cmdeploy/__init__.py @@ -11,6 +11,7 @@ from io import StringIO from pathlib import Path from chatmaild.config import Config, read_config +from cmdeploy.cmdeploy import Out from pyinfra import facts, host, logger from pyinfra.api import FactBase from pyinfra.facts.files import File, Sha256File @@ -19,6 +20,7 @@ from pyinfra.facts.systemd import SystemdEnabled from pyinfra.operations import apt, files, pip, server, systemd from .acmetool import deploy_acmetool +from .www import build_webpages, find_merge_conflict, get_paths class Port(FactBase): @@ -681,8 +683,6 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None: check_config(config) mail_domain = config.mail_domain - from .www import build_webpages, find_merge_conflict, get_paths - server.group(name="Create vmail group", group="vmail", system=True) server.user(name="Create vmail user", user="vmail", group="vmail", system=True) server.group(name="Create opendkim group", group="opendkim", system=True) @@ -738,7 +738,6 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None: # Run local DNS resolver `unbound`. # `resolvconf` takes care of setting up /etc/resolv.conf # to use 127.0.0.1 as the resolver. - from cmdeploy.cmdeploy import Out port_services = [ (["master", "smtpd"], 25),