diff --git a/src/icmtoolchain/__init__.py b/src/icmtoolchain/__init__.py index 6470bd7..0f99b46 100644 --- a/src/icmtoolchain/__init__.py +++ b/src/icmtoolchain/__init__.py @@ -130,7 +130,7 @@ class Globals: @property def PROJECT_MANAGER(self): if not hasattr(self, "project_manager"): - from .project_manager import ProjectManager + from .project_graph import ProjectManager self.project_manager = ProjectManager() return self.project_manager diff --git a/src/icmtoolchain/cli.py b/src/icmtoolchain/cli.py index 7326534..15665ac 100644 --- a/src/icmtoolchain/cli.py +++ b/src/icmtoolchain/cli.py @@ -2,7 +2,7 @@ import sys from itertools import tee from typing import MutableSet, Optional -from .project_manager import ProjectEdge, ProjectGraph +from .project_graph import ProjectEdge, ProjectGraph from .shell import pretty_print, pretty_print_attention, pretty_print_failure diff --git a/src/icmtoolchain/language.py b/src/icmtoolchain/language.py index b3002b0..3c3f7f9 100644 --- a/src/icmtoolchain/language.py +++ b/src/icmtoolchain/language.py @@ -11,7 +11,7 @@ from .shell import abort, warn from .utils import RuntimeCodeError, ensure_not_whitespace if TYPE_CHECKING: - from .project_manager import Artifact + from .project_graph import Artifact def get_language_directories(compile_type: str, language_config: Config, properties_merger: Optional[Callable] = None, make_config: Optional['MakeDataConfig'] = None) -> Dict[str, Config]: if not make_config: diff --git a/src/icmtoolchain/make_config.py b/src/icmtoolchain/make_config.py index e30f33d..54fffc2 100644 --- a/src/icmtoolchain/make_config.py +++ b/src/icmtoolchain/make_config.py @@ -7,7 +7,7 @@ from .language import (MakeAssetData, MakeDataConfig, MakeJavaData, MakeModData, MakeNativeData, MakePackData, MakePackGraphicsData, MakeResourceData, MakeScriptData, MakeSharedObjectData) -from .project_manager import Artifact +from .project_graph import Artifact from .shell import pretty_print_attention from .utils import ensure_not_whitespace @@ -77,7 +77,7 @@ class MakeConfig(MakeDataConfig): yield artifact continue if not self.get_value("project.requiredDependencies", True) or isinstance(dependency, Config) and not dependency.get_value("required", True): - pretty_print_attention(f"Skipping unsatisfied depdendency {dependency!r}, since it is optional.") + pretty_print_attention(f"Skipping unsatisfied dependency {dependency!r}, since it is optional.") continue raise ValueError(f"Invalid dependency {dependency!r}, it should be relative project path, id or repository url!") diff --git a/src/icmtoolchain/project_manager.py b/src/icmtoolchain/project_graph.py similarity index 100% rename from src/icmtoolchain/project_manager.py rename to src/icmtoolchain/project_graph.py