Skip to content

Commit ded3c05

Browse files
committed
Merge remote-tracking branch 'origin/main' into raises_paramspec
2 parents e2eb4ee + 01de0c1 commit ded3c05

File tree

128 files changed

+1940
-909
lines changed

Some content is hidden

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

128 files changed

+1940
-909
lines changed

.coveragerc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,6 @@ exclude_lines =
2929

3030
^\s*(el)?if TYPE_CHECKING:
3131
^\s*@overload( |$)
32+
^\s*def .+: \.\.\.$
3233

3334
^\s*@pytest\.mark\.xfail

.github/FUNDING.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# info:
22
# * https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository
33
# * https://tidelift.com/subscription/how-to-connect-tidelift-with-github
4+
github: pytest-dev
45
tidelift: pypi/pytest
56
open_collective: pytest
7+
thanks_dev: u/gh/pytest-dev

.github/workflows/deploy.yml

Lines changed: 3 additions & 3 deletions
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@v2.12.0
34+
uses: hynek/build-and-inspect-python-package@b5076c307dc91924a82ad150cdd1533b444d3310
3535
with:
3636
attest-build-provenance-github: 'true'
3737

@@ -56,7 +56,7 @@ jobs:
5656
path: dist
5757

5858
- name: Publish package to PyPI
59-
uses: pypa/gh-action-pypi-publish@v1.12.4
59+
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc
6060
with:
6161
attestations: true
6262

@@ -109,7 +109,7 @@ jobs:
109109
tox -e generate-gh-release-notes -- "$VERSION" scripts/latest-release-notes.md
110110
111111
- name: Publish GitHub Release
112-
uses: softprops/action-gh-release@v2
112+
uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631
113113
with:
114114
body_path: scripts/latest-release-notes.md
115115
files: dist/*

.github/workflows/test.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
fetch-depth: 0
4141
persist-credentials: false
4242
- name: Build and Check Package
43-
uses: hynek/build-and-inspect-python-package@v2.12.0
43+
uses: hynek/build-and-inspect-python-package@b5076c307dc91924a82ad150cdd1533b444d3310
4444

4545
build:
4646
needs: [package]
@@ -61,6 +61,7 @@ jobs:
6161
"windows-py311",
6262
"windows-py312",
6363
"windows-py313",
64+
"windows-py314",
6465

6566
"ubuntu-py39-lsof-numpy-pexpect",
6667
"ubuntu-py39-pluggy",
@@ -70,12 +71,14 @@ jobs:
7071
"ubuntu-py311",
7172
"ubuntu-py312",
7273
"ubuntu-py313-pexpect",
74+
"ubuntu-py314",
7375
"ubuntu-pypy3-xdist",
7476

7577
"macos-py39",
7678
"macos-py310",
7779
"macos-py312",
7880
"macos-py313",
81+
"macos-py314",
7982

8083
"doctesting",
8184
"plugins",
@@ -118,6 +121,10 @@ jobs:
118121
os: windows-latest
119122
tox_env: "py313"
120123

124+
- name: "windows-py314"
125+
python: "3.14"
126+
os: windows-latest
127+
tox_env: "py314"
121128

122129
- name: "ubuntu-py39-lsof-numpy-pexpect"
123130
python: "3.9"
@@ -163,6 +170,12 @@ jobs:
163170
tox_env: "py313-pexpect"
164171
use_coverage: true
165172

173+
- name: "ubuntu-py314"
174+
python: "3.14"
175+
os: ubuntu-latest
176+
tox_env: "py314"
177+
use_coverage: true
178+
166179
- name: "ubuntu-pypy3-xdist"
167180
python: "pypy-3.9"
168181
os: ubuntu-latest
@@ -190,6 +203,10 @@ jobs:
190203
os: macos-latest
191204
tox_env: "py313-xdist"
192205

206+
- name: "macos-py314"
207+
python: "3.14"
208+
os: macos-latest
209+
tox_env: "py314-xdist"
193210

194211
- name: "plugins"
195212
python: "3.12"
@@ -239,7 +256,8 @@ jobs:
239256
uses: actions/setup-python@v5
240257
with:
241258
python-version: ${{ matrix.python }}
242-
check-latest: ${{ endsWith(matrix.python, '-dev') }}
259+
check-latest: true
260+
allow-prereleases: true
243261

244262
- name: Install dependencies
245263
run: |
@@ -262,7 +280,7 @@ jobs:
262280

263281
- name: Upload coverage to Codecov
264282
if: "matrix.use_coverage"
265-
uses: codecov/codecov-action@v5
283+
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24
266284
with:
267285
fail_ci_if_error: false
268286
files: ./coverage.xml

.pre-commit-config.yaml

Lines changed: 23 additions & 5 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.2"
3+
rev: "v0.11.12"
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.5.2
15+
rev: v1.9.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.15.0
35+
rev: v1.16.0
3636
hooks:
3737
- id: mypy
3838
files: ^(src/|testing/|scripts/)
@@ -47,14 +47,32 @@ repos:
4747
# for mypy running on python>=3.11 since exceptiongroup is only a dependency
4848
# on <3.11
4949
- exceptiongroup>=1.0.0rc8
50+
- repo: https://github.com/RobertCraigie/pyright-python
51+
rev: v1.1.401
52+
hooks:
53+
- id: pyright
54+
files: ^(src/|scripts/)
55+
additional_dependencies:
56+
- iniconfig>=1.1.0
57+
- attrs>=19.2.0
58+
- pluggy>=1.5.0
59+
- packaging
60+
- tomli
61+
- types-setuptools
62+
- types-tabulate
63+
# for mypy running on python>=3.11 since exceptiongroup is only a dependency
64+
# on <3.11
65+
- exceptiongroup>=1.0.0rc8
66+
# Manual because passing pyright is a work in progress.
67+
stages: [manual]
5068
- repo: https://github.com/tox-dev/pyproject-fmt
51-
rev: "v2.5.1"
69+
rev: "v2.6.0"
5270
hooks:
5371
- id: pyproject-fmt
5472
# https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version
5573
additional_dependencies: ["tox>=4.9"]
5674
- repo: https://github.com/asottile/pyupgrade
57-
rev: v3.19.1
75+
rev: v3.20.0
5876
hooks:
5977
- id: pyupgrade
6078
args:

AUTHORS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ Ashley Whetter
5858
Aviral Verma
5959
Aviv Palivoda
6060
Babak Keyvani
61+
Bahram Farahmand
6162
Barney Gale
6263
Ben Brown
6364
Ben Gartner
@@ -129,6 +130,7 @@ Daw-Ran Liou
129130
Debi Mishra
130131
Denis Kirisov
131132
Denivy Braiam Rück
133+
Deysha Rivera
132134
Dheeraj C K
133135
Dhiren Serai
134136
Diego Russo
@@ -273,6 +275,7 @@ Manuel Krebber
273275
Marc Mueller
274276
Marc Schlaich
275277
Marcelo Duarte Trevisani
278+
Marcin Augustynów
276279
Marcin Bachry
277280
Marc Bresson
278281
Marco Gorelli
@@ -329,6 +332,7 @@ Nikolay Kondratyev
329332
Nipunn Koorapati
330333
Oleg Pidsadnyi
331334
Oleg Sushchenko
335+
Oleksandr Zavertniev
332336
Olga Matoula
333337
Oliver Bestwalter
334338
Omar Kohl
@@ -345,6 +349,7 @@ Pavel Karateev
345349
Pavel Zhukov
346350
Paweł Adamczak
347351
Pedro Algarvio
352+
Peter Gessler
348353
Petter Strandmark
349354
Philipp Loose
350355
Pierre Sassoulas
@@ -468,6 +473,7 @@ Volodymyr Kochetkov
468473
Volodymyr Piskun
469474
Wei Lin
470475
Wil Cooley
476+
Will Riley
471477
William Lee
472478
Wim Glenn
473479
Wouter van Ackooy

CITATION

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
NOTE: Change "x.y" by the version you use. If you are unsure about which version
2-
you are using run: `pip show pytest`.
2+
you are using run: `pip show pytest`. Do not include the patch number (i.e., z in x.y.z)
33

44
Text:
55

66
[pytest] pytest x.y, 2004
77
Krekel et al., https://github.com/pytest-dev/pytest
88

9+
BibLaTeX:
10+
11+
@software{pytest,
12+
title = {pytest x.y},
13+
author = {Holger Krekel and Bruno Oliveira and Ronny Pfannschmidt and Floris Bruynooghe and Brianna Laugher and Florian Bruhin},
14+
year = {2004},
15+
version = {x.y},
16+
url = {https://github.com/pytest-dev/pytest},
17+
note = {Contributors: Holger Krekel and Bruno Oliveira and Ronny Pfannschmidt and Floris Bruynooghe and Brianna Laugher and Florian Bruhin and others}
18+
}
19+
920
BibTeX:
1021

11-
@misc{pytestx.y,
12-
title = {pytest x.y},
13-
author = {Krekel, Holger and Oliveira, Bruno and Pfannschmidt, Ronny and Bruynooghe, Floris and Laugher, Brianna and Bruhin, Florian},
14-
year = {2004},
15-
url = {https://github.com/pytest-dev/pytest},
22+
@misc{pytest,
23+
author = {Holger Krekel and Bruno Oliveira and Ronny Pfannschmidt and Floris Bruynooghe and Brianna Laugher and Florian Bruhin},
24+
title = {pytest x.y},
25+
year = {2004},
26+
howpublished = {\url{https://github.com/pytest-dev/pytest}},
27+
note = {Version x.y. Contributors include Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin, and others.}
1628
}

CONTRIBUTING.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,8 @@ The objectives of the ``pytest-dev`` organisation are:
139139
* Sharing some of the maintenance responsibility (in case a maintainer no
140140
longer wishes to maintain a plugin)
141141

142-
You can submit your plugin by subscribing to the `pytest-dev mail list
143-
<https://mail.python.org/mailman/listinfo/pytest-dev>`_ and writing a
144-
mail pointing to your existing pytest plugin repository which must have
142+
You can submit your plugin by posting a new topic in the `pytest-dev GitHub Discussions
143+
<https://github.com/pytest-dev/pytest/discussions>`_ pointing to your existing pytest plugin repository which must have
145144
the following:
146145

147146
- PyPI presence with packaging metadata that contains a ``pytest-``

RELEASING.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,7 @@ Both automatic and manual processes described above follow the same steps from t
168168

169169
To the following mailing lists:
170170

171-
* [email protected] (all releases)
172-
* [email protected] (all releases)
173-
* [email protected] (only major/minor releases)
171+
174172

175173
And announce it with the ``#pytest`` hashtag on:
176174

changelog/10224.improvement.rst

Lines changed: 0 additions & 18 deletions
This file was deleted.

changelog/10404.bugfix.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

changelog/10839.deprecation.rst

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

changelog/11118.improvement.rst

Lines changed: 0 additions & 3 deletions
This file was deleted.

changelog/11372.breaking.rst

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

changelog/11381.improvement.rst

Lines changed: 0 additions & 17 deletions
This file was deleted.

changelog/11525.improvement.rst

Lines changed: 0 additions & 3 deletions
This file was deleted.

changelog/11538.feature.rst

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

changelog/12008.bugfix.rst

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

changelog/12017.contrib.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

changelog/12081.feature.rst

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

changelog/12346.breaking.rst

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

changelog/12426.improvement.rst

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

changelog/12504.feature.rst

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

changelog/12535.doc.rst

Lines changed: 0 additions & 4 deletions
This file was deleted.

changelog/12707.improvement.rst

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

changelog/12713.feature.rst

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)