Skip to content

Commit b95e56f

Browse files
Merge branch 'main' into chvastas/bring-back-link-checks
2 parents 029fb15 + a1a4918 commit b95e56f

38 files changed

+685
-340
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147
- name: "ubuntu-py313"
148148
python: "3.13-dev"
149149
os: ubuntu-latest
150-
tox_env: "py313"
150+
tox_env: "py313-pexpect"
151151
use_coverage: true
152152
- name: "ubuntu-pypy3"
153153
python: "pypy-3.9"

.pre-commit-config.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ repos:
3232
hooks:
3333
- id: mypy
3434
files: ^(src/|testing/|scripts/)
35-
args: []
36-
language_version: "3.12"
3735
additional_dependencies:
3836
- iniconfig>=1.1.0
3937
- attrs>=19.2.0
@@ -46,13 +44,13 @@ repos:
4644
# on <3.11
4745
- exceptiongroup>=1.0.0rc8
4846
- repo: https://github.com/tox-dev/pyproject-fmt
49-
rev: "2.2.4"
47+
rev: "2.3.1"
5048
hooks:
5149
- id: pyproject-fmt
5250
# https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version
5351
additional_dependencies: ["tox>=4.9"]
5452
- repo: https://github.com/asottile/pyupgrade
55-
rev: v3.17.0
53+
rev: v3.18.0
5654
hooks:
5755
- id: pyupgrade
5856
stages: [manual]

AUTHORS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ Christine Mecklenborg
9595
Christoph Buelter
9696
Christopher Dignam
9797
Christopher Gilling
98+
Christopher Head
9899
Claire Cecil
99100
Claudio Madotto
100101
Clément M.T. Robert
@@ -117,6 +118,7 @@ Dave Hunt
117118
David Díaz-Barquero
118119
David Mohr
119120
David Paul Röthlisberger
121+
David Peled
120122
David Szotten
121123
David Vierra
122124
Daw-Ran Liou
@@ -160,6 +162,7 @@ Feng Ma
160162
Florian Bruhin
161163
Florian Dahlitz
162164
Floris Bruynooghe
165+
Frank Hoffmann
163166
Fraser Stark
164167
Gabriel Landau
165168
Gabriel Reis
@@ -407,6 +410,7 @@ Sviatoslav Sydorenko
407410
Sylvain Marié
408411
Tadek Teleżyński
409412
Takafumi Arakaki
413+
Takumi Otani
410414
Taneli Hukkinen
411415
Tanvi Mehta
412416
Tanya Agarwal

changelog/10558.doc.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix ambiguous docstring of :func:`pytest.Config.getoption`.

changelog/10829.doc.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Improve documentation on the current handling of the ``--basetemp`` option and its lack of retention functionality (:ref:`temporary directory location and retention`).

changelog/11372.improvement.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Async tests will now fail, instead of warning+skipping, if you don't have any suitable plugin installed.

changelog/12346.misc.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Tests will now fail, instead of raising a warning, if they return any value other than None.

changelog/12497.contrib.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed two failing pdb-related tests on Python 3.13.

changelog/12818.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Assertion rewriting now preserves the source ranges of the original instructions, making it play well with tools that deal with the ``AST``, like `executing <https://github.com/alexmojaki/executing>`__.

changelog/12866.doc.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Improved cross-references concerning the :fixture:`recwarn` fixture.

0 commit comments

Comments
 (0)