Ensure that top-level 'tasks' directory is loaded. (#3582)

SFDO-Tooling · Apr 14, 2023 · eb22642 · eb22642
1 parent d45cd2b
commit eb22642
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/cumulusci/core/config/project_config.py b/cumulusci/core/config/project_config.py
@@ -673,8 +673,9 @@ def _add_tasks_directory_to_python_path(self):
             self.logger.debug(f"Adding {directory} to tasks.__path__")
             tasks.__path__.append(directory)
         if get_debug_mode():
+            spec = getattr(self.source, "spec", ".")
             self.logger.debug(
-                f"After importing {self.source.spec}:  tasks.__path__ {tasks.__path__}"
+                f"After importing {spec}:  tasks.__path__ {tasks.__path__}"
             )
 
     def construct_subproject_config(self, **kwargs) -> "BaseProjectConfig":

diff --git a/cumulusci/core/runtime.py b/cumulusci/core/runtime.py
@@ -83,6 +83,7 @@ def _load_project_config(self, *args, **kwargs):
         self.project_config = self.project_config_cls(
             self.universal_config, *args, **kwargs
         )
+        self.project_config._add_tasks_directory_to_python_path()
 
     def _load_keychain(self):
         if self.keychain is not None:

diff --git a/cumulusci/core/utils.py b/cumulusci/core/utils.py
@@ -25,7 +25,6 @@ def import_global(path: str):
     components = path.split(".")
     module = components[:-1]
     module = ".".join(module)
-    mod = __import__(module, fromlist=[str(components[-1])])
 
     if get_debug_mode():
         import sys
@@ -35,6 +34,8 @@ def import_global(path: str):
         logger.info(f"Looking in sys.path {sys.path}")
         if components[0] == "tasks":
             logger.info(f"With tasks.__path__ {sys.modules['tasks'].__path__}")
+
+    mod = __import__(module, fromlist=[str(components[-1])])
     return getattr(mod, str(components[-1]))