Address CodeQL module import issues

Author: rvermeulen

scripts/reports/codeql.py renamed to scripts/reports/codeqlvalidation.py

@@ -4,7 +4,7 @@
 
 script_path = Path(__file__)
 # Add the shared modules to the path so we can import them.
-sys.path.append(script_path.parent.parent / 'shared')
+sys.path.append(str(script_path.parent.parent / 'shared'))
 from codeql import CodeQL
 
 

scripts/reports/deviations.py

@@ -1,8 +1,15 @@
 from contextlib import redirect_stdout
 from pathlib import Path
-from codeql import CodeQLError, CodeQLValidationSummary
+from codeqlvalidation import CodeQLValidationSummary
 from error import failure
 import re
+import sys
+
+script_path = Path(__file__)
+# Add the shared modules to the path so we can import them.
+sys.path.append(str(script_path.parent.parent / 'shared'))
+from codeql import CodeQLError
+
 
 if __name__ == '__main__':
     failure("Error: this Python module does not support standalone execution!")

scripts/reports/diagnostics.py

@@ -1,8 +1,13 @@
 from contextlib import redirect_stdout
 from pathlib import Path
-from codeql import CodeQLError, CodeQLValidationSummary
+from codeqlvalidation import CodeQLValidationSummary
 from error import failure
+import sys
 
+script_path = Path(__file__)
+# Add the shared modules to the path so we can import them.
+sys.path.append(str(script_path.parent.parent / 'shared'))
+from codeql import CodeQLError
 
 class DiagnosticsSummary:
     def __init__(self, database_path, repo_root):