From f775a2bb4583f2722615e0f353c9dcab6511ad1b Mon Sep 17 00:00:00 2001 From: David Boreham Date: Mon, 6 Nov 2023 21:45:48 -0700 Subject: [PATCH] Fix remaining app references --- stack_orchestrator/build/build_containers.py | 2 +- stack_orchestrator/build/build_npms.py | 2 +- stack_orchestrator/deploy/deploy.py | 2 +- stack_orchestrator/main.py | 6 +++--- stack_orchestrator/repos/setup_repositories.py | 2 +- stack_orchestrator/version.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stack_orchestrator/build/build_containers.py b/stack_orchestrator/build/build_containers.py index 31ed2efc..c97a974f 100644 --- a/stack_orchestrator/build/build_containers.py +++ b/stack_orchestrator/build/build_containers.py @@ -67,7 +67,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args): print('Dev root directory doesn\'t exist, creating') # See: https://stackoverflow.com/a/20885799/1701505 - from app import data + from stack_orchestrator import data with importlib.resources.open_text(data, "container-image-list.txt") as container_list_file: all_containers = container_list_file.read().splitlines() diff --git a/stack_orchestrator/build/build_npms.py b/stack_orchestrator/build/build_npms.py index 9e6390ac..c8e3af43 100644 --- a/stack_orchestrator/build/build_npms.py +++ b/stack_orchestrator/build/build_npms.py @@ -83,7 +83,7 @@ def command(ctx, include, exclude, force_rebuild, extra_build_args): os.makedirs(build_root_path) # See: https://stackoverflow.com/a/20885799/1701505 - from app import data + from stack_orchestrator import data with importlib.resources.open_text(data, "npm-package-list.txt") as package_list_file: all_packages = package_list_file.read().splitlines() diff --git a/stack_orchestrator/deploy/deploy.py b/stack_orchestrator/deploy/deploy.py index b70ea989..57fedebf 100644 --- a/stack_orchestrator/deploy/deploy.py +++ b/stack_orchestrator/deploy/deploy.py @@ -273,7 +273,7 @@ def _make_cluster_context(ctx, stack, include, exclude, cluster, env_file): print(f"Using cluster name: {cluster}") # See: https://stackoverflow.com/a/20885799/1701505 - from app import data + from stack_orchestrator import data with resources.open_text(data, "pod-list.txt") as pod_list_file: all_pods = pod_list_file.read().splitlines() diff --git a/stack_orchestrator/main.py b/stack_orchestrator/main.py index 6fe62b09..ca1914e6 100644 --- a/stack_orchestrator/main.py +++ b/stack_orchestrator/main.py @@ -20,10 +20,10 @@ from stack_orchestrator.repos import setup_repositories from stack_orchestrator.build import build_containers from stack_orchestrator.build import build_npms from stack_orchestrator.deploy import deploy -from app import version +from stack_orchestrator import version from stack_orchestrator.deploy import deployment -from app import opts -from app import update +from stack_orchestrator import opts +from stack_orchestrator import update CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help']) diff --git a/stack_orchestrator/repos/setup_repositories.py b/stack_orchestrator/repos/setup_repositories.py index a32fa4ea..feca7897 100644 --- a/stack_orchestrator/repos/setup_repositories.py +++ b/stack_orchestrator/repos/setup_repositories.py @@ -232,7 +232,7 @@ def command(ctx, include, exclude, git_ssh, check_only, pull, branches, branches os.makedirs(dev_root_path) # See: https://stackoverflow.com/a/20885799/1701505 - from app import data + from stack_orchestrator import data with importlib.resources.open_text(data, "repository-list.txt") as repository_list_file: all_repos = repository_list_file.read().splitlines() diff --git a/stack_orchestrator/version.py b/stack_orchestrator/version.py index 5a5c33d4..68e47b44 100644 --- a/stack_orchestrator/version.py +++ b/stack_orchestrator/version.py @@ -23,7 +23,7 @@ def command(ctx): '''print tool version''' # See: https://stackoverflow.com/a/20885799/1701505 - from app import data + from stack_orchestrator import data with importlib.resources.open_text(data, "build_tag.txt") as version_file: # TODO: code better version that skips comment lines version_string = version_file.read().splitlines()[1]