Skip to content

Commit 57b2eee

Browse files
Merge branch 'master' into fix-report-template
2 parents 87c467c + 656506d commit 57b2eee

File tree

14 files changed

+397
-535
lines changed

14 files changed

+397
-535
lines changed

.github/workflows/tests.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Python
2323
uses: actions/setup-python@v4
2424
with:
25-
python-version: '3.10'
25+
python-version: '3.x'
2626

2727
- name: Ensure latest pip
2828
run: python -m pip install --upgrade pip
@@ -87,20 +87,20 @@ jobs:
8787
fail-fast: false
8888
matrix:
8989
os: [ubuntu-latest, windows-latest, macos-latest]
90-
python-version: ["3.8", "3.9", "3.10", "pypy3.9"]
90+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9"]
9191
include:
9292
- os: ubuntu-latest
9393
python-version: "3.10"
9494
with-coverage: true
9595

9696
- os: ubuntu-latest
97-
python-version: 3.11-dev
97+
python-version: 3.13
9898
tox-env: devel
9999
- os: windows-latest
100-
python-version: 3.11-dev
100+
python-version: 3.13
101101
tox-env: devel
102102
- os: macos-latest
103-
python-version: 3.11-dev
103+
python-version: 3.13
104104
tox-env: devel
105105

106106
steps:
@@ -163,11 +163,11 @@ jobs:
163163
strategy:
164164
fail-fast: false
165165
matrix:
166-
python-version: ["3.8", "3.9", "3.10", "pypy3.9"]
166+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9"]
167167
include:
168168
- python-version: "3.10"
169169
with-coverage: true
170-
- python-version: 3.11-dev
170+
- python-version: 3.13
171171
tox-env: devel
172172

173173
steps:
@@ -233,9 +233,9 @@ jobs:
233233
strategy:
234234
fail-fast: false
235235
matrix:
236-
python-version: ["3.8", "3.9", "3.10", "pypy3.9"]
236+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9"]
237237
include:
238-
- python-version: 3.11-dev
238+
- python-version: 3.13
239239
tox-env: devel
240240

241241
steps:

.pre-commit-config.yaml

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
repos:
22
- repo: https://github.com/psf/black
3-
rev: 24.1.1
3+
rev: 24.10.0
44
hooks:
55
- id: black
66
args: [--safe, --quiet, --line-length=88]
77

8+
- repo: https://github.com/tox-dev/pyproject-fmt
9+
rev: "v2.5.0"
10+
hooks:
11+
- id: pyproject-fmt
12+
# https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version
13+
additional_dependencies: ["tox>=4.9"]
14+
815
- repo: https://github.com/asottile/blacken-docs
9-
rev: 1.16.0
16+
rev: 1.19.1
1017
hooks:
1118
- id: blacken-docs
12-
additional_dependencies: [black==22.3.0]
19+
additional_dependencies: [black==24.10.0]
1320

1421
- repo: https://github.com/pre-commit/pre-commit-hooks
15-
rev: v4.5.0
22+
rev: v5.0.0
1623
hooks:
1724
- id: trailing-whitespace
1825
- id: end-of-file-fixer
@@ -25,7 +32,7 @@ repos:
2532
args: ['--branch', 'master']
2633

2734
- repo: https://github.com/PyCQA/flake8
28-
rev: 7.0.0
35+
rev: 7.1.1
2936
hooks:
3037
- id: flake8
3138
language_version: python3
@@ -34,26 +41,32 @@ repos:
3441
- flake8-typing-imports==1.12.0
3542

3643
- repo: https://github.com/asottile/reorder-python-imports
37-
rev: v3.12.0
44+
rev: v3.14.0
3845
hooks:
3946
- id: reorder-python-imports
4047
args: ["--application-directories=.:src:testing", --py3-plus]
4148

4249
- repo: https://github.com/asottile/pyupgrade
43-
rev: v3.15.0
50+
rev: v3.19.0
4451
hooks:
4552
- id: pyupgrade
46-
args: [--py3-plus]
53+
args: [--py39-plus]
4754

4855
- repo: https://github.com/pre-commit/mirrors-eslint
49-
rev: v8.52.0
56+
rev: v9.15.0
5057
hooks:
5158
- id: eslint
5259
additional_dependencies:
5360
5461
5562
args: ["--fix"]
56-
63+
- repo: https://github.com/pre-commit/mirrors-mypy
64+
rev: v1.13.0
65+
hooks:
66+
- id: mypy
67+
files: ^(src/pytest_html|testing)
68+
additional_dependencies:
69+
- types-setuptools
5770
- repo: local
5871
hooks:
5972
- id: rst

docs/requirements.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@ alabaster==0.7.13
88
# via sphinx
99
babel==2.12.1
1010
# via sphinx
11-
certifi==2023.5.7
11+
certifi==2024.7.4
1212
# via requests
1313
charset-normalizer==3.1.0
1414
# via requests
1515
docutils==0.18.1
1616
# via
1717
# sphinx
1818
# sphinx-rtd-theme
19-
idna==3.4
19+
idna==3.7
2020
# via requests
2121
imagesize==1.4.1
2222
# via sphinx
23-
importlib-metadata==6.6.0
23+
importlib-metadata==8.5.0
2424
# via sphinx
25-
jinja2==3.1.2
25+
jinja2==3.1.4
2626
# via sphinx
2727
markupsafe==2.1.2
2828
# via jinja2
2929
packaging==23.1
3030
# via sphinx
3131
pygments==2.15.1
3232
# via sphinx
33-
requests==2.30.0
33+
requests==2.32.2
3434
# via sphinx
3535
snowballstemmer==2.2.0
3636
# via sphinx
@@ -55,7 +55,7 @@ sphinxcontrib-qthelp==1.0.3
5555
# via sphinx
5656
sphinxcontrib-serializinghtml==1.1.5
5757
# via sphinx
58-
urllib3==2.0.2
58+
urllib3==2.2.2
5959
# via requests
60-
zipp==3.15.0
60+
zipp==3.21.0
6161
# via importlib-metadata

0 commit comments

Comments
 (0)