update suite_report

Author: james-bruten-mo

github_scripts/suite_data.py

@@ -9,6 +9,7 @@
 """
 
 import re
+import os
 import shutil
 import sqlite3
 import subprocess
@@ -18,6 +19,7 @@
 from typing import Dict, List, Optional, Set, Union
 from git_bdiff import GitBDiff, GitInfo
 
+
 class SuiteData:
     """
     Class to gather info on a suite
@@ -188,6 +190,8 @@ def populate_gitinfo(self) -> None:
         """
 
         for dependency in self.dependencies:
+            print(dependency)
+            print(self.temp_directory)
             self.dependencies[dependency]["gitinfo"] = GitInfo(
                 self.temp_directory / dependency
             )
@@ -283,21 +287,18 @@ def read_rose_conf(self) -> Dict[str, str]:
 
     def find_unknown_dependency(self, dependency: str) -> str:
         """
-        TEMPORARY
         The primary dependency may be unset in the dependencies file. In this case find
-        it from the *_SOURCE variable in the rose-suite.conf.
-        TODO: Once cylc provides the location of the source code itself, this method
-        should be changed to use that instead, as then the _SOURCE variable will be
-        removed
-        """
-
-        var = f"{dependency.upper()}_SOURCE".replace('"', "")
-        if var not in self.rose_data:
-            raise RuntimeError(f"Cant determine source for {dependency}")
-        rval = self.rose_data[var]
-        if "$ROSE_ORIG_HOST" in rval:
-            rval = rval.replace("$ROSE_ORIG_HOST", self.rose_data["ROSE_ORIG_HOST"])
-        return rval
+        it from the CYLC_WORKFLOW_SRC_DIR variable that gets set in the
+        flow-processed.cylc file
+        """
+
+        log_file = self.suite_path / "log" / "scheduler" / "log"
+        with open(log_file, "r") as f:
+            for line in f:
+                line = line.strip()
+                if re.search(f"{dependency.upper()} SOURCE CLONE=", line):
+                    return line.split("=")[1].rstrip("/")
+        raise RuntimeError(f"Unable to find source for dependency {dependency}")
 
     def read_dependencies(self) -> Dict[str, Dict]:
         """

github_scripts/suite_report_git.py

@@ -373,8 +373,8 @@ def main() -> None:
 
     args = parse_args()
 
+    suite_report = SuiteReport(args.suite_path)
     try:
-        suite_report = SuiteReport(args.suite_path)
         suite_report.create_log()
         suite_report.write_log(args.log_path)
     finally: