Skip to content

Commit 30f9e55

Browse files
authored
Merge branch 'main' into style-use-typename-in-raises-errors
2 parents fb7afc9 + 980bb5c commit 30f9e55

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1588
-874
lines changed

.github/workflows/deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
attestations: write
2626

2727
steps:
28-
- uses: actions/checkout@v5
28+
- uses: actions/checkout@v6
2929
with:
3030
fetch-depth: 0
3131
persist-credentials: false
@@ -42,7 +42,7 @@ jobs:
4242
permissions:
4343
contents: read
4444
steps:
45-
- uses: actions/checkout@v5
45+
- uses: actions/checkout@v6
4646
with:
4747
fetch-depth: 0
4848
persist-credentials: false
@@ -99,7 +99,7 @@ jobs:
9999
permissions:
100100
contents: write
101101
steps:
102-
- uses: actions/checkout@v5
102+
- uses: actions/checkout@v6
103103
with:
104104
fetch-depth: 0
105105
persist-credentials: true

.github/workflows/doc-check-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v5
20+
uses: actions/checkout@v6
2121
with:
2222
fetch-depth: 0
2323
persist-credentials: false

.github/workflows/prepare-release-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
pull-requests: write
2828

2929
steps:
30-
- uses: actions/checkout@v5
30+
- uses: actions/checkout@v6
3131
with:
3232
fetch-depth: 0
3333
# persist-credentials is needed in order for us to push the release branch.

.github/workflows/test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
package:
3838
runs-on: ubuntu-latest
3939
steps:
40-
- uses: actions/checkout@v5
40+
- uses: actions/checkout@v6
4141
with:
4242
fetch-depth: 0
4343
persist-credentials: false
@@ -139,6 +139,7 @@ jobs:
139139
python: "3.14"
140140
os: windows-latest
141141
tox_env: "py314"
142+
use_coverage: true
142143

143144
# Use separate jobs for different unittest flavors (twisted, asynctest) to ensure proper coverage.
144145
- name: "ubuntu-py310-unittest-asynctest"
@@ -250,7 +251,7 @@ jobs:
250251
continue-on-error: ${{ matrix.xfail && true || false }}
251252

252253
steps:
253-
- uses: actions/checkout@v5
254+
- uses: actions/checkout@v6
254255
with:
255256
fetch-depth: 0
256257
persist-credentials: false

.github/workflows/update-plugin-list.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v5
23+
uses: actions/checkout@v6
2424
with:
2525
fetch-depth: 0
2626
persist-credentials: false

.pre-commit-config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
minimum_pre_commit_version: "4.4.0"
22
repos:
33
- repo: https://github.com/astral-sh/ruff-pre-commit
4-
rev: "v0.14.5"
4+
rev: "v0.14.8"
55
hooks:
66
- id: ruff-check
77
args: ["--fix"]
@@ -13,7 +13,7 @@ repos:
1313
- id: end-of-file-fixer
1414
- id: check-yaml
1515
- repo: https://github.com/woodruffw/zizmor-pre-commit
16-
rev: v1.16.3
16+
rev: v1.18.0
1717
hooks:
1818
- id: zizmor
1919
args: ["--fix"]
@@ -34,7 +34,7 @@ repos:
3434
hooks:
3535
- id: python-use-type-annotations
3636
- repo: https://github.com/pre-commit/mirrors-mypy
37-
rev: v1.18.2
37+
rev: v1.19.0
3838
hooks:
3939
- id: mypy
4040
files: ^(src/|testing/|scripts/)
@@ -74,7 +74,7 @@ repos:
7474
# https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version
7575
additional_dependencies: ["tox>=4.9"]
7676
- repo: https://github.com/asottile/pyupgrade
77-
rev: v3.21.1
77+
rev: v3.21.2
7878
hooks:
7979
- id: pyupgrade
8080
args:
@@ -94,10 +94,10 @@ repos:
9494
stages: [manual]
9595
- id: rst
9696
name: rst
97-
entry: rst-lint --encoding utf-8
97+
entry: rst-lint
9898
files: ^(RELEASING.rst|README.rst|TIDELIFT.rst)$
9999
language: python
100-
additional_dependencies: [pygments, restructuredtext_lint]
100+
additional_dependencies: [pygments, restructuredtext_lint>=2.0.0]
101101
- id: changelogs-rst
102102
name: changelog filenames
103103
language: fail

AUTHORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ Joseph Sawaya
237237
Josh Karpel
238238
Joshua Bronson
239239
Julian Valentin
240+
Junhao Liao
240241
Jurko Gospodnetić
241242
Justice Ndou
242243
Justyna Janczyszyn
@@ -459,6 +460,7 @@ TJ Bruno
459460
Tobias Diez
460461
Tobias Petersen
461462
Tom Dalton
463+
Tom Most
462464
Tom Viner
463465
Tomáš Gavenčiak
464466
Tomer Keren

CONTRIBUTING.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Look through the `GitHub issues for bugs <https://github.com/pytest-dev/pytest/l
4949
See also the `"good first issue" issues <https://github.com/pytest-dev/pytest/labels/good%20first%20issue>`_
5050
that are friendly to new contributors.
5151

52-
:ref:`Talk <contact>` to developers to find out how you can fix specific bugs. To indicate that you are going
52+
`Talk to developers <https://docs.pytest.org/en/stable/contact.html>`_ to find out how you can fix specific bugs. To indicate that you are going
5353
to work on a particular issue, add a comment to that effect on the specific issue.
5454

5555
Don't forget to check the issue trackers of your favourite plugins, too!
@@ -61,7 +61,7 @@ Implement features
6161

6262
Look through the `GitHub issues for enhancements <https://github.com/pytest-dev/pytest/labels/type:%20enhancement>`_.
6363

64-
:ref:`Talk <contact>` to developers to find out how you can implement specific
64+
`Talk to developers <https://docs.pytest.org/en/stable/contact.html>`_ to find out how you can implement specific
6565
features.
6666

6767
Write documentation

changelog/13884.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed rare internal IndexError caused by `builtins.compile` being overridden in client code.

changelog/13904.bugfix.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)