diff --git a/Makefile b/Makefile index f44b7620f0..70cca704bf 100644 --- a/Makefile +++ b/Makefile @@ -388,4 +388,4 @@ deploy-bundles: down up # Redeploy all apps cumulated from inventory bundles on an existing inventory (no down/up, no entity purge; requires a prior deploy-bundles run). redeploy-bundles: - @bash scripts/tests/deploy/local/deploy/redeploy-bundles.sh + @bash scripts/tests/deploy/local/deploy/redeploy-bundles.sh \ No newline at end of file diff --git a/utils/inventory/bundle_apps.py b/utils/inventory/bundle_apps.py index 39f3438211..d6d066af0f 100644 --- a/utils/inventory/bundle_apps.py +++ b/utils/inventory/bundle_apps.py @@ -14,15 +14,18 @@ from __future__ import annotations import argparse import sys -from pathlib import Path -from typing import Iterable +from typing import TYPE_CHECKING +from utils import PROJECT_ROOT from utils.cache.yaml import load_yaml -REPO_ROOT = Path(__file__).resolve().parents[2] +if TYPE_CHECKING: + from collections.abc import Iterable + from pathlib import Path + SEARCH_DIRS = ( - REPO_ROOT / "inventories" / "bundles" / "servers", - REPO_ROOT / "inventories" / "bundles" / "workstations", + PROJECT_ROOT / "inventories" / "bundles" / "servers", + PROJECT_ROOT / "inventories" / "bundles" / "workstations", )