Skip to content

Commit dd3472e

Browse files
committed
Merge remote-tracking branch 'origin/main' into raises_paramspec
2 parents 94101d5 + d149ab3 commit dd3472e

Some content is hidden

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

82 files changed

+4439
-667
lines changed

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

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

4949
- name: Create Pull Request
5050
id: pr
51-
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
51+
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
5252
with:
5353
commit-message: '[automated] Update plugin list'
5454
author: 'pytest bot <[email protected]>'

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: "v0.9.7"
3+
rev: "v0.9.10"
44
hooks:
55
- id: ruff
66
args: ["--fix"]
@@ -12,7 +12,7 @@ repos:
1212
- id: end-of-file-fixer
1313
- id: check-yaml
1414
- repo: https://github.com/woodruffw/zizmor-pre-commit
15-
rev: v1.3.1
15+
rev: v1.4.1
1616
hooks:
1717
- id: zizmor
1818
- repo: https://github.com/adamchainz/blacken-docs
@@ -48,7 +48,7 @@ repos:
4848
# on <3.11
4949
- exceptiongroup>=1.0.0rc8
5050
- repo: https://github.com/tox-dev/pyproject-fmt
51-
rev: "v2.5.0"
51+
rev: "v2.5.1"
5252
hooks:
5353
- id: pyproject-fmt
5454
# https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version

AUTHORS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Andras Tim
3232
Andrea Cimatoribus
3333
Andreas Motl
3434
Andreas Zeidler
35+
Andrew Pikul
3536
Andrew Shapton
3637
Andrey Paramonov
3738
Andrzej Klajnert
@@ -43,6 +44,7 @@ Anthony Shaw
4344
Anthony Sottile
4445
Anton Grinevich
4546
Anton Lodder
47+
Anton Zhilin
4648
Antony Lee
4749
Arel Cordero
4850
Arias Emmanuel
@@ -263,6 +265,7 @@ lovetheguitar
263265
Lukas Bednar
264266
Luke Murphy
265267
Maciek Fijalkowski
268+
Maggie Chung
266269
Maho
267270
Maik Figura
268271
Mandeep Bhutani

changelog/10558.doc.rst

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

changelog/10829.doc.rst

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

changelog/11538.feature.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Added :class:`pytest.RaisesGroup` as an equivalent to :func:`pytest.raises` for expecting :exc:`ExceptionGroup`. Also adds :class:`pytest.RaisesExc` which is now the logic behind :func:`pytest.raises` and used as parameter to :class:`pytest.RaisesGroup`. ``RaisesGroup`` includes the ability to specify multiple different expected exceptions, the structure of nested exception groups, and flags for emulating :ref:`except* <except_star>`. See :ref:`assert-matching-exception-groups` and docstrings for more information.

changelog/11777.bugfix.rst

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

changelog/12017.contrib.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Mixed internal improvements:
2+
3+
* Migrate formatting to f-strings in some tests.
4+
* Use type-safe constructs in JUnitXML tests.
5+
* Moved`` MockTiming`` into ``_pytest.timing``.
6+
7+
-- by :user:`RonnyPfannschmidt`

changelog/12081.feature.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Added :fixture:`capteesys` to capture AND pass output to next handler set by ``--capture=``.

changelog/12497.contrib.rst

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

0 commit comments

Comments
 (0)