Skip to content

Commit

Permalink
Fix remaining app references
Browse files Browse the repository at this point in the history
  • Loading branch information
dboreham committed Nov 7, 2023
1 parent 813fcbc commit f775a2b
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion stack_orchestrator/build/build_containers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion stack_orchestrator/build/build_npms.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion stack_orchestrator/deploy/deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
6 changes: 3 additions & 3 deletions stack_orchestrator/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
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'])

Expand Down
2 changes: 1 addition & 1 deletion stack_orchestrator/repos/setup_repositories.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion stack_orchestrator/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit f775a2b

Please sign in to comment.