Skip to content

Commit 86c9293

Browse files
authored
Merge branch 'main' into pep-693
2 parents 7679d6b + cfc6606 commit 86c9293

40 files changed

+686
-244
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
persist-credentials: false
3232

3333
- name: Build and Check Package
34-
uses: hynek/build-and-inspect-python-package@b5076c307dc91924a82ad150cdd1533b444d3310
34+
uses: hynek/build-and-inspect-python-package@c52c3a4710070b50470d903818a7b25115dcd076
3535
with:
3636
attest-build-provenance-github: 'true'
3737

.github/workflows/test.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ on:
2020
- reopened # default
2121
- ready_for_review # used in PRs created from the release workflow
2222

23+
workflow_dispatch: # allows manual triggering of the workflow
24+
2325
env:
2426
PYTEST_ADDOPTS: "--color=yes"
2527

@@ -40,7 +42,7 @@ jobs:
4042
fetch-depth: 0
4143
persist-credentials: false
4244
- name: Build and Check Package
43-
uses: hynek/build-and-inspect-python-package@b5076c307dc91924a82ad150cdd1533b444d3310
45+
uses: hynek/build-and-inspect-python-package@c52c3a4710070b50470d903818a7b25115dcd076
4446

4547
build:
4648
needs: [package]

.pre-commit-config.yaml

Lines changed: 4 additions & 4 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.11.13"
3+
rev: "v0.12.3"
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.9.0
15+
rev: v1.11.0
1616
hooks:
1717
- id: zizmor
1818
- repo: https://github.com/adamchainz/blacken-docs
@@ -32,7 +32,7 @@ repos:
3232
hooks:
3333
- id: python-use-type-annotations
3434
- repo: https://github.com/pre-commit/mirrors-mypy
35-
rev: v1.16.0
35+
rev: v1.16.1
3636
hooks:
3737
- id: mypy
3838
files: ^(src/|testing/|scripts/)
@@ -48,7 +48,7 @@ repos:
4848
# on <3.11
4949
- exceptiongroup>=1.0.0rc8
5050
- repo: https://github.com/RobertCraigie/pyright-python
51-
rev: v1.1.402
51+
rev: v1.1.403
5252
hooks:
5353
- id: pyright
5454
files: ^(src/|scripts/)

AUTHORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ Deysha Rivera
134134
Dheeraj C K
135135
Dhiren Serai
136136
Diego Russo
137+
Dima Gerasimov
137138
Dmitry Dygalo
138139
Dmitry Pribysh
139140
Dominic Mortlock
@@ -261,6 +262,7 @@ Leonardus Chen
261262
Lev Maximov
262263
Levon Saldamli
263264
Lewis Cowles
265+
Liam DeVoe
264266
Llandy Riveron Del Risco
265267
Loic Esteve
266268
lovetheguitar

changelog/13445.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Made the type annotations of :func:`pytest.skip` and friends more spec-complaint to have them work across more type checkers.

changelog/13478.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed a crash when using :confval:`console_output_style` with ``times`` and a module is skipped.

changelog/13480.bugfix.rst

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

changelog/13480.contrib.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Self-testing: fixed a few test failures when run with ``-Wdefault`` or a similar override.

changelog/13522.bugfix.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Fixed :fixture:`pytester` in subprocess mode ignored all :attr`pytester.plugins <pytest.Pytester.plugins>` except the first.
2+
3+
Fixed :fixture:`pytester` in subprocess mode silently ignored non-str :attr:`pytester.plugins <pytest.Pytester.plugins>`.
4+
Now it errors instead.
5+
If you are affected by this, specify the plugin by name, or switch the affected tests to use :func:`pytester.runpytest_inprocess <pytest.Pytester.runpytest_inprocess>` explicitly instead.

changelog/13530.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed a crash when using :func:`pytest.approx` and :class:`decimal.Decimal` instances with the :class:`decimal.FloatOperation` trap set.

0 commit comments

Comments
 (0)