Pyta Template File Now Resolves Relative To Cwd

CHANGELOG.md

@@ -10,6 +10,7 @@ and adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### ✨ Enhancements
 
 - Added custom error message for `comparison-with-callable`
+- Changed `pyta-template-file` argument to now resolve the file path relative to the CWD.
 
 ### 💫 New checkers
 

README.md

@@ -78,6 +78,7 @@ Simon Chen,
 Freeman Cheng,
 Ivan Chepelev,
 Yianni Culmone,
+Daniel Dervishi,
 Nigel Fong,
 Adam Gleizer,
 Ibrahim Hasan,

docs/usage/configuration.md

@@ -118,9 +118,9 @@ The maximum number of occurrences of each check to report.
 This option can be used to limit the size of the output report.
 If set to 0 (the default), all occurrences are shown.
 
-### `pyta-template-file` (default: `"template.html.jinja"`)
+### `pyta-template-file` (default: Path to PythonTA's `template.html.jinja`)
 
-HTML template file for the HTMLReporter.
+Path to HTML template file for the HTMLReporter.
 
 ### `allow-pylint-comments` (default: `false`)
 

python_ta/__init__.py

@@ -63,6 +63,8 @@
 # Flag to determine if we've previously patched pylint
 PYLINT_PATCHED = False
 
+TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "reporters/templates")
+
 
 def check_errors(
     module_name: Union[list[str], str] = "",
@@ -282,6 +284,7 @@ def reset_linter(
         - If the config argument is a dictionary, apply those options afterward.
     Do not re-use a linter object. Returns a new linter.
     """
+
     # Tuple of custom options. Note: 'type' must map to a value equal a key in the pylint/config/option.py `VALIDATORS` dict.
     new_checker_options = (
         (
@@ -296,7 +299,7 @@ def reset_linter(
         (
             "pyta-template-file",
             {
-                "default": "template.html.jinja",
+                "default": os.path.join(TEMPLATES_DIR, "template.html.jinja"),
                 "type": "string",
                 "metavar": "<pyta_reporter>",
                 "help": "HTML template file for the HTMLReporter.",

python_ta/config/.pylintrc

@@ -8,8 +8,9 @@ pyta-number-of-messages = 0
 # (DEPRECATED: Use output-format option below.) Set the [REPORTS] output-format option instead.
 # pyta-reporter = HTMLReporter
 
-# Set the location of the template for HTMLReporter.
-pyta-template-file = template.html.jinja
+# Set the path of the template for HTMLReporter. Ex:
+# pyta-template-file = ../../templates/template.html.jinja
+# pyta-template-file = /Users/user/pyta/python_ta/reporters/templates/template.html.jinja
 
 #Set whether you wish to opt-in to anonymous data collection of errors reported when you run PyTA.
 pyta-error-permission = no

python_ta/reporters/html_reporter.py

@@ -12,8 +12,6 @@
 
 from .core import PythonTaReporter
 
-TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "templates")
-
 
 class HTMLReporter(PythonTaReporter):
     """Reporter that displays results in HTML form.
@@ -62,9 +60,15 @@ def display_messages(self, layout: BaseLayout) -> None:
         grouped_messages = {path: self.group_messages(msgs) for path, msgs in self.messages.items()}
 
         template_f = self.linter.config.pyta_template_file
-        template = Environment(loader=FileSystemLoader(TEMPLATES_DIR)).get_template(template_f)
+        path = os.path.abspath(template_f)
+        filename, file_parent_directory = os.path.basename(path), os.path.dirname(path)
+
+        template = Environment(loader=FileSystemLoader(file_parent_directory)).get_template(
+            filename
+        )
 
         # Embed resources so the output html can go anywhere, independent of assets.
+        # TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "templates")
         # with open(os.path.join(TEMPLATES_DIR, 'pyta_logo_markdown.png'), 'rb+') as image_file:
         #     # Encode img binary to base64 (+33% size), decode to remove the "b'"
         #     pyta_logo_base64_encoded = b64encode(image_file.read()).decode()

tests/test.pylintrc

@@ -8,8 +8,9 @@ pyta-number-of-messages = 0
 # (DEPRECATED: Use output-format option below.) Set the [REPORTS] output-format option instead.
 # pyta-reporter = HTMLReporter
 
-# Set the location of the template for HTMLReporter.
-pyta-template-file = template.html.jinja
+# Set the path of the template for HTMLReporter. Ex:
+# pyta-template-file = ../../templates/template.html.jinja
+# pyta-template-file = /Users/user/pyta/python_ta/reporters/templates/template.html.jinja
 
 #Set whether you wish to opt-in to anonymous data collection of errors reported when you run PyTA.
 pyta-error-permission = no