pytest-html-plus 0.4.2__tar.gz → 0.4.4__tar.gz

{pytest_html_plus-0.4.2 → pytest_html_plus-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pytest-html-plus
-Version: 0.4.2
+Version: 0.4.4
 Summary: Get started with rich pytest reports in under 3 seconds. Just install the plugin — no setup required. The simplest, fastest reporter for pytest.
 License: MIT
 Keywords: pytest,pytest-html-plus,pytest-plugin,html-test-report,beautiful-test-report,shareable-test-results,test-report,test-results,unit-test-report,functional-test-report,test-summary,reporting,python-testing,automated-testing,test-runner,report-generator,continuous-integration,ci-cd,github-actions,jenkins,pytest-html,pytest-report

{pytest_html_plus-0.4.2 → pytest_html_plus-0.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pytest-html-plus"
-version = "0.4.2"
+version = "0.4.4"
 description = "Get started with rich pytest reports in under 3 seconds. Just install the plugin — no setup required. The simplest, fastest reporter for pytest."
 readme = "README.md"
 authors = ["reporterplus"]

{pytest_html_plus-0.4.2 → pytest_html_plus-0.4.4}/pytest_html_plus/compute_report_metadata.py

@@ -1,18 +1,20 @@
 import json
 from datetime import datetime
 
-from pytest_html_plus.utils import is_main_worker, get_env_marker, get_git_branch, get_git_commit, get_report_title, \
+from pytest_html_plus.utils import is_main_worker, get_env_marker, get_report_title, \
     get_python_version
 
 
-def write_plus_metadata_if_main_worker(config, report_path, output_path="plus_metadata.json"):
+def write_plus_metadata_if_main_worker(config, report_path, output_path="plus_metadata.json", **kwargs):
     if not is_main_worker():
         return
+    branch = kwargs.get("git_branch", "NA")
+    commit = kwargs.get("git_commit", "NA")
     metadata = {
         "report_title": get_report_title(output_path=report_path),
         "environment": get_env_marker(config),
-        "branch": get_git_branch(),
-        "commit": get_git_commit(),
+        "branch": branch,
+        "commit": commit,
         "python_version": get_python_version(),
         "generated_at": datetime.now().isoformat()
     }

{pytest_html_plus-0.4.2 → pytest_html_plus-0.4.4}/pytest_html_plus/plugin.py

@@ -162,11 +162,14 @@ def pytest_sessionfinish(session, exitstatus):
 
 def pytest_sessionstart(session):
     html_output = session.config.getoption("--html-output") or "report_output"
+    git_branch = session.config.getoption("--git-branch") or "NA"
+    git_commit = session.config.getoption("--git-commit") or "NA"
     configure_logging()
     session.config.addinivalue_line(
        "markers", "link(url): Add a link to external test case or documentation."
    )
-    write_plus_metadata_if_main_worker(session.config, report_path=html_output)
+    write_plus_metadata_if_main_worker(session.config, report_path=html_output,
+                                       git_branch=git_branch, git_commit=git_commit)
 
 
 def pytest_load_initial_conftests(args):
@@ -221,6 +224,18 @@ def pytest_addoption(parser):
        default=None,
        help="Path to output the XML report (used with --generatexml)"
    )
+   parser.addoption(
+       "--git-branch",
+       action="store",
+       default="NA",
+       help="Helps show branch information on the report"
+   )
+   parser.addoption(
+       "--git-commit",
+       action="store",
+       default="NA",
+       help="Helps show commitId information on the report"
+   )
 
 import logging
 import sys

{pytest_html_plus-0.4.2 → pytest_html_plus-0.4.4}/pytest_html_plus/utils.py

@@ -3,32 +3,6 @@ import subprocess
 import shutil
 import os
 
-
-def get_git_commit():
-    try:
-        return subprocess.check_output(["git", "rev-parse", "HEAD"]).decode().strip()
-    except Exception:
-        return "NA"
-
-def get_git_branch():
-    branch_env_vars = [
-        "GITHUB_HEAD_REF", "GITHUB_REF_NAME",
-        "CI_COMMIT_REF_NAME", "BITBUCKET_BRANCH",
-        "BUILD_SOURCEBRANCHNAME", "CIRCLE_BRANCH",
-        "BRANCH_NAME", "TRAVIS_BRANCH"
-    ]
-    for var in branch_env_vars:
-        val = os.getenv(var)
-        if val:
-            return val
-
-    try:
-        return subprocess.check_output(
-            ["git", "rev-parse", "--abbrev-ref", "HEAD"]
-        ).decode().strip()
-    except Exception:
-        return "NA"
-
 def get_env_marker(config):
     for arg in ("--env", "--environment"):
         if config.getoption(arg.lstrip("-").replace("-", "_"), default=None):