Renamed project_manager.py to project_graph.py, unsatisfied dependency typo fix
This commit is contained in:
@@ -130,7 +130,7 @@ class Globals:
|
|||||||
@property
|
@property
|
||||||
def PROJECT_MANAGER(self):
|
def PROJECT_MANAGER(self):
|
||||||
if not hasattr(self, "project_manager"):
|
if not hasattr(self, "project_manager"):
|
||||||
from .project_manager import ProjectManager
|
from .project_graph import ProjectManager
|
||||||
self.project_manager = ProjectManager()
|
self.project_manager = ProjectManager()
|
||||||
return self.project_manager
|
return self.project_manager
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import sys
|
|||||||
from itertools import tee
|
from itertools import tee
|
||||||
from typing import MutableSet, Optional
|
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
|
from .shell import pretty_print, pretty_print_attention, pretty_print_failure
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ from .shell import abort, warn
|
|||||||
from .utils import RuntimeCodeError, ensure_not_whitespace
|
from .utils import RuntimeCodeError, ensure_not_whitespace
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
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]:
|
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:
|
if not make_config:
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ from .language import (MakeAssetData, MakeDataConfig, MakeJavaData,
|
|||||||
MakeModData, MakeNativeData, MakePackData,
|
MakeModData, MakeNativeData, MakePackData,
|
||||||
MakePackGraphicsData, MakeResourceData, MakeScriptData,
|
MakePackGraphicsData, MakeResourceData, MakeScriptData,
|
||||||
MakeSharedObjectData)
|
MakeSharedObjectData)
|
||||||
from .project_manager import Artifact
|
from .project_graph import Artifact
|
||||||
from .shell import pretty_print_attention
|
from .shell import pretty_print_attention
|
||||||
from .utils import ensure_not_whitespace
|
from .utils import ensure_not_whitespace
|
||||||
|
|
||||||
@@ -77,7 +77,7 @@ class MakeConfig(MakeDataConfig):
|
|||||||
yield artifact
|
yield artifact
|
||||||
continue
|
continue
|
||||||
if not self.get_value("project.requiredDependencies", True) or isinstance(dependency, Config) and not dependency.get_value("required", True):
|
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
|
continue
|
||||||
raise ValueError(f"Invalid dependency {dependency!r}, it should be relative project path, id or repository url!")
|
raise ValueError(f"Invalid dependency {dependency!r}, it should be relative project path, id or repository url!")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user