8000 Merge branch 'main' into bug-stopiteration-hook · pytest-dev/pytest@69e78b7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 69e78b7

Browse files
graingertgraingert
authored
Merge branch 'main' into bug-stopiteration-hook
2 parents 9af9742 + 544f589 commit 69e78b7

Some content is hidden

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

84 files changed

+4343
-731
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ jobs:
3030
- uses: actions/checkout@v4
3131
with:
3232
fetch-depth: 0
33-
persist-credentials: false
33+
# persist-credentials is needed in order for us to push the release branch.
34+
persist-credentials: true
3435

3536
- name: Set up Python
3637
uses: actions/setup-python@v5
@@ -47,13 +48,15 @@ jobs:
4748
env:
4849
BRANCH: ${{ github.event.inputs.branch }}
4950
PRERELEASE: ${{ github.event.inputs.prerelease }}
51+
GH_TOKEN: ${{ github.token }}
5052
run: |
51-
tox -e prepare-release-pr -- "$BRANCH" ${{ github.token }} --prerelease="$PRERELEASE"
53+
tox -e prepare-release-pr -- "$BRANCH" --prerelease="$PRERELEASE"
5254
5355
- name: Prepare release PR (major release)
5456
if: github.event.inputs.major == 'yes'
5557
env:
5658
BRANCH: ${{ github.event.inputs.branch }}
5759
PRERELEASE: ${{ github.event.inputs.prerelease }}
60+
GH_TOKEN: ${{ github.token }}
5861
run: |
59-
tox -e prepare-release-pr -- "$BRANCH" ${{ github.token }} --major --prerelease="$PRERELEASE"
62+
tox -e prepare-release-pr -- "$BRANCH" --major --prerelease="$PRERELEASE"

‎.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 <pytestbot@users.noreply.github.com>'

‎.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.11.2"
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.5.2
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: 2 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
@@ -264,6 +265,7 @@ lovetheguitar
264265
Lukas Bednar
265266
Luke Murphy
266267
Maciek Fijalkowski
268+
Maggie Chung
267269
Maho
268270
Maik Figura
269271
Mandeep Bhutani

‎RELEASING.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,10 @@ Both automatic and manual processes described above follow the same steps from t
137137
in https://github.com/pytest-dev/pytest/actions/workflows/deploy.yml, using the ``release-MAJOR.MINOR.PATCH`` branch
138138
as source.
139139

140+
Using the command-line::
141+
142+
$ gh workflow run deploy.yml -R pytest-dev/pytest --ref=release-{VERSION} -f version={VERSION}
143+
140144
This job will require approval from ``pytest-dev/core``, after which it will publish to PyPI
141145
and tag the repository.
142146

‎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`

0 commit comments

Comments
 (0)
0