Fix pre-commit issues

Author: BeyondEvil

.eslintrc.json

@@ -47,9 +47,9 @@
         "no-var": "error",
         "object-curly-spacing": [
             "error",
-            "always", 
-            { 
-                "arraysInObjects": true 
+            "always",
+            {
+                "arraysInObjects": true
             }
         ],
         "prefer-const": "error",

.github/workflows/actions.yml

@@ -39,8 +39,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       PY_COLORS: 1
-      TOXENV: packaging
-
     steps:
       - name: Switch to using Python 3.10 by default
         uses: actions/setup-python@v4
@@ -76,8 +74,14 @@ jobs:
           |
           xargs git tag --delete
 
-      - name: Build dists
-        run: python -m tox
+      - name: Build and Check Package
+        uses: hynek/build-and-inspect-python-package@v1
+
+      - name: Download Package
+        uses: actions/download-artifact@v3
+        with:
+          name: Packages
+          path: dist
 
       - name: Publish to test.pypi.org
         if: >-
@@ -91,7 +95,7 @@ jobs:
             github.event_name == 'create' &&
             github.event.ref_type == 'tag'
           )
-        uses: pypa/gh-action-pypi-publish@v1
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.testpypi_password }}
           repository_url: https://test.pypi.org/legacy/
@@ -100,6 +104,6 @@ jobs:
         if: >-  # "create" workflows run separately from "push" & "pull_request"
           github.event_name == 'create' &&
           github.event.ref_type == 'tag'
-        uses: pypa/gh-action-pypi-publish@v1
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.pypi_password }}

.github/workflows/tests.yml

@@ -109,8 +109,8 @@ jobs:
       # TODO: https://github.com/pytest-dev/pytest-html/issues/481
       - name: Upload coverage to codecov
         if: >-
-          ${{ 
-            ! github.event.schedule && 
+          ${{
+            ! github.event.schedule &&
             ! matrix.skip-coverage &&
             github.repository_owner == 'pytest-dev'
           }}

.pre-commit-config.yaml

@@ -3,12 +3,14 @@ repos:
     rev: 22.3.0
     hooks:
       - id: black
-        args: [--safe, --quiet]
+        args: [--safe, --quiet, --line-length=88]
+
   - repo: https://github.com/asottile/blacken-docs
     rev: v1.12.1
     hooks:
       - id: blacken-docs
         additional_dependencies: [black==22.3.0]
+
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.1.0
     hooks:
@@ -19,6 +21,7 @@ repos:
       - id: check-yaml
       - id: debug-statements
         language_version: python3
+
   - repo: https://github.com/PyCQA/flake8
     rev: 4.0.1
     hooks:
@@ -27,23 +30,27 @@ repos:
         additional_dependencies:
           - flake8-builtins==1.5.3
           - flake8-typing-imports==1.12.0
+
   - repo: https://github.com/asottile/reorder_python_imports
     rev: v3.0.1
     hooks:
       - id: reorder-python-imports
         args: ["--application-directories=.:src:testing", --py3-plus]
+
   - repo: https://github.com/asottile/pyupgrade
     rev: v2.32.0
     hooks:
       - id: pyupgrade
         args: [--py3-plus]
+
 #  - repo: https://github.com/pre-commit/mirrors-eslint
 #    rev: v7.13.0
 #    hooks:
 #      - id: eslint
 #        additional_dependencies:
 #          - [email protected]
 #        args: [src]
+
   - repo: local
     hooks:
       - id: rst
@@ -52,6 +59,7 @@ repos:
         files: ^(README.rst)$
         language: python
         additional_dependencies: [pygments, restructuredtext_lint]
+
   - repo: https://github.com/elidupuis/mirrors-sass-lint
     rev: "5cc45653263b423398e4af2561fae362903dd45d"
     hooks:

src/pytest_html/nextgen.py

@@ -3,13 +3,13 @@
 import datetime
 import json
 import os
-import pytest
 import re
 import warnings
-
 from collections import defaultdict
 from functools import partial
 from pathlib import Path
+
+import pytest
 from jinja2 import Environment
 from jinja2 import FileSystemLoader
 from jinja2 import select_autoescape
@@ -22,9 +22,7 @@
 try:
     from ansi2html import Ansi2HTMLConverter, style
 
-    converter = Ansi2HTMLConverter(
-        inline=False, escaped=False
-    )
+    converter = Ansi2HTMLConverter(inline=False, escaped=False)
     _handle_ansi = partial(converter.convert, full=False)
     _ansi_styles = style.get_styles()
 except ImportError:
@@ -34,8 +32,8 @@
     _ansi_styles = []
 
 
-class BaseReport(object):
-    class Cells(object):
+class BaseReport:
+    class Cells:
         def __init__(self):
             self._html = {}
 
@@ -46,7 +44,7 @@ def html(self):
         def insert(self, index, html):
             self._html[index] = html
 
-    class Report(object):
+    class Report:
         def __init__(self, title, duration_format):
             self._data = {
                 "title": title,
@@ -80,9 +78,13 @@ def __init__(self, report_path, config, default_css="style.css"):
         self._resources_path = Path(__file__).parent.joinpath("resources")
         self._config = config
         self._template = _read_template([self._resources_path])
-        self._css = _process_css(Path(self._resources_path, default_css), self._config.getoption("css"))
+        self._css = _process_css(
+            Path(self._resources_path, default_css), self._config.getoption("css")
+        )
         self._duration_format = config.getini("duration_format")
-        self._max_asset_filename_length = int(config.getini("max_asset_filename_length"))
+        self._max_asset_filename_length = int(
+            config.getini("max_asset_filename_length")
+        )
         self._report = self.Report(self._report_path.name, self._duration_format)
 
     @property
@@ -96,7 +98,7 @@ def _asset_filename(self, test_id, extra_index, test_index, file_extension):
             str(extra_index),
             str(test_index),
             file_extension,
-        )[-self._max_asset_filename_length:]
+        )[-self._max_asset_filename_length :]
 
     def _generate_report(self, self_contained=False):
         generated = datetime.datetime.now()
@@ -147,19 +149,28 @@ def _process_extras(self, report, test_id):
                 test_id.encode("utf-8").decode("unicode_escape"),
                 extra_index,
                 test_index,
-                extra['extension']
+                extra["extension"],
             )
             if extra["format_type"] == extras.FORMAT_JSON:
                 content = json.dumps(content)
-                extra["content"] = self._data_content(content, asset_name=asset_name, mime_type=extra["mime_type"])
+                extra["content"] = self._data_content(
+                    content, asset_name=asset_name, mime_type=extra["mime_type"]
+                )
 
             if extra["format_type"] == extras.FORMAT_TEXT:
                 if isinstance(content, bytes):
                     content = content.decode("utf-8")
-                extra["content"] = self._data_content(content, asset_name=asset_name, mime_type=extra["mime_type"])
-
-            if extra["format_type"] == extras.FORMAT_IMAGE or extra["format_type"] == extras.FORMAT_VIDEO:
-                extra["content"] = self._media_content(content, asset_name=asset_name, mime_type=extra["mime_type"])
+                extra["content"] = self._data_content(
+                    content, asset_name=asset_name, mime_type=extra["mime_type"]
+                )
+
+            if (
+                extra["format_type"] == extras.FORMAT_IMAGE
+                or extra["format_type"] == extras.FORMAT_VIDEO
+            ):
+                extra["content"] = self._media_content(
+                    content, asset_name=asset_name, mime_type=extra["mime_type"]
+                )
 
         return report_extras
 
@@ -218,7 +229,9 @@ def pytest_sessionfinish(self, session):
 
     @pytest.hookimpl(trylast=True)
     def pytest_terminal_summary(self, terminalreporter):
-        terminalreporter.write_sep("-", f"Generated html report: file://{self._report_path.resolve()}")
+        terminalreporter.write_sep(
+            "-", f"Generated html report: file://{self._report_path.resolve()}"
+        )
 
     @pytest.hookimpl(trylast=True)
     def pytest_collection_finish(self, session):
@@ -307,7 +320,7 @@ def _media_content(self, content, mime_type, *args, **kwargs):
             base64.b64decode(content.encode("utf-8"), validate=True)
             return f"data:{mime_type};base64,{content}"
         except binascii.Error:
-            # if not base64 content, issue warning and just return as it's a file or link
+            # if not base64, issue warning and just return as it's a file or link
             warnings.warn(
                 "Self-contained HTML report "
                 "includes link to external "
@@ -361,7 +374,7 @@ def _read_template(search_paths, template_name="index.jinja2"):
     env = Environment(
         loader=FileSystemLoader(search_paths),
         autoescape=select_autoescape(
-            enabled_extensions=('jinja2',),
+            enabled_extensions=("jinja2",),
         ),
     )
     return env.get_template(template_name)

src/pytest_html/plugin.py

@@ -1,11 +1,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-import pytest
 import warnings
 from pathlib import Path
 
-from . import extras  # noqa: F401
+import pytest
+
 from .nextgen import NextGenReport
 from .nextgen import NextGenSelfContainedReport
 
@@ -121,8 +121,9 @@ def test_foo(extra):
             extra.append(pytest_html.extras.url("https://www.example.com/"))
     """
     warnings.warn(
-        "The 'extra' fixture is deprecated and will be removed in a future release, use 'extras' instead.",
-        DeprecationWarning
+        "The 'extra' fixture is deprecated and will be removed in a future release"
+        ", use 'extras' instead.",
+        DeprecationWarning,
     )
     pytestconfig.extras = []
     yield pytestconfig.extras

src/pytest_html/resources/index.jinja2

@@ -49,8 +49,8 @@
                   </div>
                   <div class="media-container__nav--right">></div>
                 </div>
-                <div class="media__name"></div> 
-                <div class="media__counter"></div> 
+                <div class="media__name"></div>
+                <div class="media__counter"></div>
             </div>
             <div class="log"></div>
           </td>