Update next-gen with recent changes to master (#494)

* remove phantomjs dependency (#424) * properly classify all npm dependencies (#425) * Move the changelog to read the docs (#423) * split plugin.py into smaller files (#427) * Implement the visible URL query parameter to control visibility of test results on page load. (#433) * enable control of test result visability via query params * Allow for redacting of environment table values (#431) * Disable Codecov (#480) * Disable Codecov * Disable pypy3 on mac * Add Tests.yml reusable workflow (#484) * Use the tests reusable workflow (#486) * Migrate to precommit.ci (#487) * Separate Nightly workflow (#488) Co-authored-by: Gleb Nikonorov <gleb.i.nikonorov@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
pytest-dev · Jan 26, 2022 · ff7cc32 · ff7cc32
1 parent ff08751
commit ff7cc32
Show file tree

Hide file tree

Showing 12 changed files with 404 additions and 164 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -1,4 +1,4 @@
-name: gh
+name: Main
 
 on:
   create:  # is used for publishing to PyPI and TestPyPI
@@ -12,163 +12,30 @@ on:
     - >-
       **
   pull_request:
-  schedule:
-    - cron: 1 0 * * *  # Run daily at 0:01 UTC
 
 jobs:
   build_docs:
     name: Build Docs
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
         python-version: 3.6
     - name: Install tox
-      run: |
-        python -m pip install --upgrade tox
+      run: python -m pip install --upgrade tox
     - name: Build docs with tox
-      run: |
-        python -m tox -e docs
-  build_python:
-    name: ${{ matrix.name }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-18.04
-            name: py36-ubuntu
-            python-version: 3.6
-
-          - os: windows-latest
-            name: py36-windows
-            python-version: 3.6
-
-          - os: macOS-latest
-            name: py36-mac
-            python-version: 3.6
-
-          - os: ubuntu-18.04
-            name: py37-ubuntu
-            python-version: 3.7
-
-          - os: windows-latest
-            name: py37-windows
-            python-version: 3.7
-
-          - os: macOS-latest
-            name: py37-mac
-            python-version: 3.7
-
-          - os: ubuntu-18.04
-            name: py38-ubuntu
-            python-version: 3.8
-
-          - os: windows-latest
-            name: py38-windows
-            python-version: 3.8
-
-          - os: macOS-latest
-            name: py38-mac
-            python-version: 3.8
+      run: python -m tox -e docs
 
-          - os: ubuntu-18.04
-            name: py39-ubuntu
-            python-version: 3.9
+  tests:
+    uses: pytest-dev/pytest-html/.github/workflows/tests.yml@master
 
-          - os: windows-latest
-            name: py39-windows
-            python-version: 3.9
-
-          - os: macOS-latest
-            name: py39-mac
-            python-version: 3.9
-
-          - os: ubuntu-18.04
-            name: pypy3-ubuntu
-            python-version: pypy3
-
-          - os: windows-latest
-            name: pypy3-windows
-            python-version: pypy3
-
-          - os: macOS-latest
-            name: pypy3-mac
-            python-version: pypy3
-
-          - os: ubuntu-18.04
-            name: devel-ubuntu
-            python-version: 3.8
-
-    steps:
-    - name: Set Newline Behavior
-      run : |
-        git config --global core.autocrlf false
-    - uses: actions/checkout@master
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix['python-version'] }}
-    - name: Install tox
-      run: |
-        python -m pip install --upgrade tox
-    - name: Get Tox Environment Name From Matrix Name
-      uses: rishabhgupta/split-by@v1
-      id: split-matrix-name
-      with:
-        string: '${{ matrix.name }}'
-        split-by: '-'
-    - name: Test with tox
-      run: |
-        python -m tox -e ${{ steps.split-matrix-name.outputs._0}}-cov
-    - name: Upload coverage to codecov
-      uses: codecov/codecov-action@v1
-      with:
-        fail_ci_if_error: true
-        file: ./coverage.xml
-        flags: tests
-        name: ${{ matrix.py }} - ${{ matrix.os }}
-        verbose: true
-  build_javascript:
-    name: grunt
-    runs-on: ubuntu-18.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: '12.x'
-    - name: Install Dependencies
-      run: |
-        npm install
-    - name: QUnit Tests
-      run: |
-        npm test
-      env:
-        CI: true
-  linting:
-    name: linting
-    runs-on: ubuntu-18.04
-    steps:
-    - uses: actions/checkout@master
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.6
-    - name: Install tox
-      run: |
-        python -m pip install --upgrade tox
-    - name: Lint with tox
-      run: |
-        python -m tox -e linting
   publish:
     name: Publish to PyPI registry
     needs:
-      - build_python
-      - build_javascript
+      - tests
     runs-on: ubuntu-latest
-
     env:
       PY_COLORS: 1
       TOXENV: packaging

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -0,0 +1,9 @@
+name: Nightly tests
+
+on:
+  schedule:
+    - cron: '1 0 * * *'  # Run daily at 0:01 UTC
+
+jobs:
+  tests:
+    uses: pytest-dev/pytest-html/.github/workflows/tests.yml@master
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -0,0 +1,119 @@
+name: Tests
+
+on:
+  workflow_call:
+
+jobs:
+  test_python:
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            name: py36-ubuntu
+            python-version: 3.6
+
+          - os: windows-latest
+            name: py36-windows
+            python-version: 3.6
+
+          - os: macOS-latest
+            name: py36-mac
+            python-version: 3.6
+
+          - os: ubuntu-latest
+            name: py37-ubuntu
+            python-version: 3.7
+
+          - os: windows-latest
+            name: py37-windows
+            python-version: 3.7
+
+          - os: macOS-latest
+            name: py37-mac
+            python-version: 3.7
+
+          - os: ubuntu-latest
+            name: py38-ubuntu
+            python-version: 3.8
+
+          - os: windows-latest
+            name: py38-windows
+            python-version: 3.8
+
+          - os: macOS-latest
+            name: py38-mac
+            python-version: 3.8
+
+          - os: ubuntu-latest
+            name: py39-ubuntu
+            python-version: 3.9
+
+          - os: windows-latest
+            name: py39-windows
+            python-version: 3.9
+
+          - os: macOS-latest
+            name: py39-mac
+            python-version: 3.9
+
+          - os: ubuntu-latest
+            name: pypy3-ubuntu
+            python-version: pypy3
+
+          - os: windows-latest
+            name: pypy3-windows
+            python-version: pypy3
+
+           # https://github.com/pytest-dev/pytest-html/issues/482
+#          - os: macOS-latest
+#            name: pypy3-mac
+#            python-version: pypy3
+
+          - os: ubuntu-latest
+            name: devel-ubuntu
+            python-version: 3.9
+
+    steps:
+      - name: Set Newline Behavior
+        run : git config --global core.autocrlf false
+      - uses: actions/checkout@master
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix['python-version'] }}
+      - name: Install tox
+        run: python -m pip install --upgrade tox
+      - name: Get Tox Environment Name From Matrix Name
+        uses: rishabhgupta/split-by@v1
+        id: split-matrix-name
+        with:
+          string: '${{ matrix.name }}'
+          split-by: '-'
+      - name: Test with tox
+        run: python -m tox -e ${{ steps.split-matrix-name.outputs._0}}-cov
+       # TODO: https://github.com/pytest-dev/pytest-html/issues/481
+#      - name: Upload coverage to codecov
+#        if: github.event.schedule == ''
+#        uses: codecov/codecov-action@v2
+#        with:
+#          fail_ci_if_error: true
+#          file: ./coverage.xml
+#          flags: tests
+#          name: ${{ matrix.py }} - ${{ matrix.os }}
+#          verbose: true
+
+  test_javascript:
+    name: grunt
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+      - name: Install Dependencies
+        run: npm install
+      - name: QUnit Tests
+        run: npm test
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -37,13 +37,13 @@ repos:
     hooks:
       - id: pyupgrade
         args: [--py3-plus]
-  - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v7.13.0
-    hooks:
-      - id: eslint
-        additional_dependencies:
-          - eslint@7.13.0
-        args: [src]
+#  - repo: https://github.com/pre-commit/mirrors-eslint
+#    rev: v7.13.0
+#    hooks:
+#      - id: eslint
+#        additional_dependencies:
+#          - eslint@7.13.0
+#        args: [src]
   - repo: local
     hooks:
       - id: rst

diff --git a/pyproject.toml b/pyproject.toml
@@ -11,4 +11,3 @@ build-backend = "setuptools.build_meta"
 [tool.setuptools_scm]
 local_scheme = "no-local-version"
 write_to = "src/pytest_html/__version.py"
-
diff --git a/src/pytest_html/html_report.py b/src/pytest_html/html_report.py
@@ -178,7 +178,7 @@ def _generate_report(self, session):
         ]
 
         with open(
-            os.path.join(os.path.dirname(__file__), "resources", "main.js")
+            os.path.join(os.path.dirname(__file__), "resources", "old_main.js")
         ) as main_js_fp:
             main_js = main_js_fp.read()
 

diff --git a/src/pytest_html/plugin.py b/src/pytest_html/plugin.py
@@ -4,12 +4,12 @@
 import os
 
 import pytest
+from _pytest.pathlib import Path
 
 from . import extras  # noqa: F401
 from .html_report import HTMLReport
 from .nextgen import NextGenReport
 
-from _pytest.pathlib import Path
 
 def pytest_addhooks(pluginmanager):
     from . import hooks

diff --git a/src/pytest_html/resources/index.html b/src/pytest_html/resources/index.html
@@ -64,17 +64,17 @@ <h2>Environment</h2>
         <h2>Summary</h2>
         <p class="run-count"></p>
         <p class="filter">(Un)check the boxes to filter the results.</p>
-        
-        <input checked="true" class="filter" data-test-result="error" name="filter_checkbox" type="checkbox"/><span class="error"></span> 
+
+        <input checked="true" class="filter" data-test-result="error" name="filter_checkbox" type="checkbox"/><span class="error"></span>
         <input checked="true" class="filter" data-test-result="failed" name="filter_checkbox" type="checkbox"/><span class="failed"></span>
         <input checked="true" class="filter" data-test-result="rerun" name="filter_checkbox" type="checkbox"/><span class="rerun"></span>
-        <input checked="true" class="filter" data-test-result="xfailed" name="filter_checkbox" type="checkbox"/><span class="xfailed"></span> 
-        <input checked="true" class="filter" data-test-result="xpassed" name="filter_checkbox" type="checkbox"/><span class="xpassed"></span> 
+        <input checked="true" class="filter" data-test-result="xfailed" name="filter_checkbox" type="checkbox"/><span class="xfailed"></span>
+        <input checked="true" class="filter" data-test-result="xpassed" name="filter_checkbox" type="checkbox"/><span class="xpassed"></span>
         <input checked="true" class="filter" data-test-result="passed" name="filter_checkbox" type="checkbox"/><span class="passed"></span>
         <input checked="true" class="filter" data-test-result="skipped" name="filter_checkbox" type="checkbox"/><span class="skipped"></span>
 
 
-        
+
       </div>
       <div class="summary__reload">
         <div class="summary__reload__button" onclick="location.reload()">
@@ -86,7 +86,7 @@ <h2>Summary</h2>
     </div>
     <h2>Results</h2>
     <table id="results-table">
-      
+
     </table>
   </body>
   <footer>
@@ -97,4 +97,4 @@ <h2>Results</h2>
     <script src="index.js"></script>
     <script src="main.js"></script>
   </footer>
-</html>
+</html>