Merge branch 'pytest-dev:master' into master

This commit is contained in:
Harmin Parra Rueda 2025-04-16 22:17:29 +02:00 committed by GitHub
commit 9e00456b47
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 1753 additions and 802 deletions

15
.github/dependabot.yml vendored Normal file
View File

@ -0,0 +1,15 @@
version: 2
updates:
- package-ecosystem: "npm"
# Look for `package.json` and `lock` files in the `root` directory
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"

View File

@ -11,21 +11,21 @@ jobs:
if: github.repository == 'pytest-dev/pytest-html' if: github.repository == 'pytest-dev/pytest-html'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
persist-credentials: false persist-credentials: false
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v3 uses: actions/setup-node@v4
with: with:
node-version: '16.x' node-version: '16.x'
- name: Build and Check Package - name: Build and Check Package
uses: hynek/build-and-inspect-python-package@v1 uses: hynek/build-and-inspect-python-package@v2
- name: Download Package - name: Download Package
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: Packages name: Packages
path: dist path: dist

View File

@ -13,6 +13,6 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
# Drafts your next Release notes as Pull Requests are merged into "master" # Drafts your next Release notes as Pull Requests are merged into "master"
- uses: release-drafter/release-drafter@v5 - uses: release-drafter/release-drafter@v6
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@ -1,12 +1,12 @@
repos: repos:
- repo: https://github.com/psf/black - repo: https://github.com/psf/black
rev: 24.10.0 rev: 25.1.0
hooks: hooks:
- id: black - id: black
args: [--safe, --quiet, --line-length=88] args: [--safe, --quiet, --line-length=88]
- repo: https://github.com/tox-dev/pyproject-fmt - repo: https://github.com/tox-dev/pyproject-fmt
rev: "v2.5.0" rev: "v2.5.1"
hooks: hooks:
- id: pyproject-fmt - id: pyproject-fmt
# https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version # https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version
@ -32,7 +32,7 @@ repos:
args: ['--branch', 'master'] args: ['--branch', 'master']
- repo: https://github.com/PyCQA/flake8 - repo: https://github.com/PyCQA/flake8
rev: 7.1.1 rev: 7.2.0
hooks: hooks:
- id: flake8 - id: flake8
language_version: python3 language_version: python3
@ -47,13 +47,13 @@ repos:
args: ["--application-directories=.:src:testing", --py3-plus] args: ["--application-directories=.:src:testing", --py3-plus]
- repo: https://github.com/asottile/pyupgrade - repo: https://github.com/asottile/pyupgrade
rev: v3.19.0 rev: v3.19.1
hooks: hooks:
- id: pyupgrade - id: pyupgrade
args: [--py39-plus] args: [--py39-plus]
- repo: https://github.com/pre-commit/mirrors-eslint - repo: https://github.com/pre-commit/mirrors-eslint
rev: v9.16.0 rev: v9.24.0
hooks: hooks:
- id: eslint - id: eslint
additional_dependencies: additional_dependencies:
@ -61,7 +61,7 @@ repos:
- eslint-config-google@0.14.0 - eslint-config-google@0.14.0
args: ["--fix"] args: ["--fix"]
- repo: https://github.com/pre-commit/mirrors-mypy - repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.13.0 rev: v1.15.0
hooks: hooks:
- id: mypy - id: mypy
files: ^(src/pytest_html|testing) files: ^(src/pytest_html|testing)

View File

@ -1,2 +1,2 @@
sphinx<7.0.0 sphinx<9.0.0
sphinx_rtd_theme sphinx_rtd_theme

View File

@ -4,15 +4,15 @@
# #
# pip-compile --resolver=backtracking requirements.in # pip-compile --resolver=backtracking requirements.in
# #
alabaster==0.7.13 alabaster==1.0.0
# via sphinx # via sphinx
babel==2.12.1 babel==2.17.0
# via sphinx # via sphinx
certifi==2024.7.4 certifi==2024.7.4
# via requests # via requests
charset-normalizer==3.1.0 charset-normalizer==3.1.0
# via requests # via requests
docutils==0.18.1 docutils==0.21.2
# via # via
# sphinx # sphinx
# sphinx-rtd-theme # sphinx-rtd-theme
@ -20,42 +20,40 @@ idna==3.7
# via requests # via requests
imagesize==1.4.1 imagesize==1.4.1
# via sphinx # via sphinx
importlib-metadata==8.5.0 jinja2==3.1.6
# via sphinx
jinja2==3.1.5
# via sphinx # via sphinx
markupsafe==2.1.2 markupsafe==2.1.2
# via jinja2 # via jinja2
packaging==23.1 packaging==23.1
# via sphinx # via sphinx
pygments==2.15.1 pygments==2.19.1
# via sphinx # via sphinx
requests==2.32.2 requests==2.32.2
# via sphinx # via sphinx
roman-numerals-py==3.1.0
# via sphinx
snowballstemmer==2.2.0 snowballstemmer==2.2.0
# via sphinx # via sphinx
sphinx==6.2.1 sphinx==8.2.3
# via # via
# -r requirements.in # -r docs/requirements.in
# sphinx-rtd-theme # sphinx-rtd-theme
# sphinxcontrib-jquery # sphinxcontrib-jquery
sphinx-rtd-theme==1.2.0 sphinx-rtd-theme==3.0.2
# via -r requirements.in # via -r docs/requirements.in
sphinxcontrib-applehelp==1.0.4 sphinxcontrib-applehelp==2.0.0
# via sphinx # via sphinx
sphinxcontrib-devhelp==1.0.2 sphinxcontrib-devhelp==2.0.0
# via sphinx # via sphinx
sphinxcontrib-htmlhelp==2.0.1 sphinxcontrib-htmlhelp==2.1.0
# via sphinx # via sphinx
sphinxcontrib-jquery==4.1 sphinxcontrib-jquery==4.1
# via sphinx-rtd-theme # via sphinx-rtd-theme
sphinxcontrib-jsmath==1.0.1 sphinxcontrib-jsmath==1.0.1
# via sphinx # via sphinx
sphinxcontrib-qthelp==1.0.3 sphinxcontrib-qthelp==2.0.0
# via sphinx # via sphinx
sphinxcontrib-serializinghtml==1.1.5 sphinxcontrib-serializinghtml==2.0.0
# via sphinx # via sphinx
urllib3==2.2.2 urllib3==2.2.2
# via requests # via requests
zipp==3.21.0
# via importlib-metadata

2482
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -8,14 +8,14 @@
"all": "npm run lint && npm run unit && npm run build:css && npm run build:jsapp" "all": "npm run lint && npm run unit && npm run build:css && npm run build:jsapp"
}, },
"devDependencies": { "devDependencies": {
"browserify": "^17.0.0", "browserify": "^17.0.1",
"chai": "^4.3.6", "chai": "^4.3.6",
"eslint": "^8.20.0", "eslint": "^8.20.0",
"eslint-config-google": "^0.14.0", "eslint-config-google": "^0.14.0",
"mocha": "^10.0.0", "mocha": "^11.1.0",
"mock-local-storage": "^1.1.24", "mock-local-storage": "^1.1.24",
"nyc": "^15.1.0", "nyc": "^17.1.0",
"sass": "^1.52.3", "sass": "^1.85.1",
"sinon": "^14.0.0" "sinon": "^20.0.0"
} }
} }

View File

@ -111,11 +111,11 @@
</tr> </tr>
</thead> </thead>
</table> </table>
</body>
<footer> <footer>
<div id="data-container" data-jsonblob="{{ test_data }}"></div> <div id="data-container" data-jsonblob="{{ test_data }}"></div>
<script> <script>
{% include "app.js" %} {% include "app.js" %}
</script> </script>
</footer> </footer>
</body>
</html> </html>