Skip to content

Commit 1b7546b

Browse files
authored
Merge branch 'main' into skip-asynctest-support-python-3-11-plus
2 parents 46568cc + a55c959 commit 1b7546b

Some content is hidden

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

62 files changed

+691
-358
lines changed

.github/workflows/test.yml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ jobs:
112112
python: "3.10"
113113
os: windows-latest
114114
tox_env: "py310-pluggymain-pylib-xdist"
115+
xfail: true
115116

116117
- name: "windows-py310-xdist"
117118
python: "3.10"
@@ -132,6 +133,7 @@ jobs:
132133
python: "3.13"
133134
os: windows-latest
134135
tox_env: "py313"
136+
xfail: true
135137

136138
- name: "windows-py314"
137139
python: "3.14"
@@ -167,11 +169,13 @@ jobs:
167169
python: "3.10"
168170
os: ubuntu-latest
169171
tox_env: "py310-pluggymain-pylib-xdist"
172+
xfail: true
170173

171174
- name: "ubuntu-py310-freeze"
172175
python: "3.10"
173176
os: ubuntu-latest
174177
tox_env: "py310-freeze"
178+
xfail: true
175179

176180
- name: "ubuntu-py310-xdist"
177181
python: "3.10"
@@ -195,6 +199,7 @@ jobs:
195199
os: ubuntu-latest
196200
tox_env: "py313-pexpect"
197201
use_coverage: true
202+
xfail: true
198203

199204
- name: "ubuntu-py314"
200205
python: "3.14"
@@ -212,6 +217,7 @@ jobs:
212217
python: "3.10"
213218
os: macos-latest
214219
tox_env: "py310-xdist"
220+
xfail: true
215221

216222
- name: "macos-py312"
217223
python: "3.12"
@@ -222,6 +228,7 @@ jobs:
222228
python: "3.13"
223229
os: macos-latest
224230
tox_env: "py313-xdist"
231+
xfail: true
225232

226233
- name: "macos-py314"
227234
python: "3.14"
@@ -240,25 +247,7 @@ jobs:
240247
tox_env: "doctesting"
241248
use_coverage: true
242249

243-
continue-on-error: >-
244-
${{
245-
contains(
246-
fromJSON(
247-
'[
248-
"windows-py310-pluggy",
249-
"windows-py313",
250-
"ubuntu-py310-pluggy",
251-
"ubuntu-py310-freeze",
252-
"ubuntu-py313",
253-
"macos-py310",
254-
"macos-py313"
255-
]'
256-
),
257-
matrix.name
258-
)
259-
&& true
260-
|| false
261-
}}
250+
continue-on-error: ${{ matrix.xfail && true || false }}
262251

263252
steps:
264253
- uses: actions/checkout@v5

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: "v0.12.12"
3+
rev: "v0.13.2"
44
hooks:
5-
- id: ruff
5+
- id: ruff-check
66
args: ["--fix"]
77
- id: ruff-format
88
- repo: https://github.com/pre-commit/pre-commit-hooks
@@ -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.12.1
15+
rev: v1.14.2
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.17.1
35+
rev: v1.18.2
3636
hooks:
3737
- id: mypy
3838
files: ^(src/|testing/|scripts/)

AUTHORS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ Andrzej Klajnert
3939
Andrzej Ostrowski
4040
Andy Freeland
4141
Anita Hammer
42+
Anna Tasiopoulou
4243
Anthon van der Neut
4344
Anthony Shaw
4445
Anthony Sottile
@@ -201,6 +202,7 @@ Ilya Konstantinov
201202
Ionuț Turturică
202203
Isaac Virshup
203204
Israel Fruchter
205+
Israël Hallé
204206
Itxaso Aizpurua
205207
Iwan Briquemont
206208
Jaap Broekhuizen
@@ -226,6 +228,7 @@ Jon Parise
226228
Jon Sonesen
227229
Jonas Obrist
228230
Jordan Guymon
231+
Jordan Macdonald
229232
Jordan Moldow
230233
Jordan Speicher
231234
Joseph Hunkeler

changelog/13072.feature.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Added support for displaying test session progress in the terminal tab using the `OSC 9;4; <https://conemu.github.io/en/AnsiEscapeCodes.html#ConEmu_specific_OSC>`_ ANSI sequence.
2+
When pytest runs in a supported terminal emulator like ConEmu, Gnome Terminal, Ptyxis, Windows Terminal, Kitty or Ghostty,
3+
you'll see the progress in the terminal tab or window,
4+
allowing you to monitor pytest's progress at a glance.
5+
6+
This feature is automatically enabled when running in a TTY. It is implemented as an internal plugin. If needed, it can be disabled as follows:
7+
- On a user level, using ``-p no:terminalprogress`` on the command line or via an environment variable ``PYTEST_ADDOPTS='-p no:terminalprogress'``.
8+
- On a project configuration level, using ``addopts = "-p no:terminalprogress"``.

changelog/13732.improvement.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Previously, when filtering warnings, pytest would fail if the filter referenced a class that could not be imported. Now, this only outputs a message indicating the problem.

changelog/13766.breaking.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Previously, pytest would assume it was running in a CI/CD environment if either of the environment variables `$CI` or `$BUILD_NUMBER` was defined;
2+
now, CI mode is only activated if at least one of those variables is defined and set to a *non-empty* value.

doc/en/example/.ruff.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lint.ignore = ["RUF059"]

doc/en/explanation/ci.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ adapt some of its behaviours.
1717
How CI is detected
1818
------------------
1919

20-
Pytest knows it is in a CI environment when either one of these environment variables are set,
21-
regardless of their value:
20+
Pytest knows it is in a CI environment when either one of these environment variables are set to a non-empty value:
2221

2322
* `CI`: used by many CI systems.
2423
* `BUILD_NUMBER`: used by Jenkins.

doc/en/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
.. sidebar:: **Next Open Trainings and Events**
44

5-
- `Testen mit pytest <https://www.letsboot.ch/kurs/pytest>`_ (German), via `Letsboot <https://www.letsboot.ch/>`_ (3 day in-depth training), **October 29th -- 31st**, Zurich (CH)
65
- `Professional Testing with Python <https://python-academy.com/courses/python_course_testing.html>`_, via `Python Academy <https://www.python-academy.com/>`_ (3 day in-depth training), **March 3th -- 5th 2026**, Leipzig (DE) / Remote
76

87
Also see :doc:`previous talks and blogposts <talks>`

0 commit comments

Comments
 (0)