Skip to content

Commit a3599ca

Browse files
committed
Prepare release version 6.2.5
1 parent 27613b8 commit a3599ca

25 files changed

+108
-69
lines changed

changelog/8494.trivial.rst

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

changelog/9040.trivial.rst

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

doc/en/announce/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Release announcements
66
:maxdepth: 2
77

88

9+
release-6.2.5
910
release-6.2.4
1011
release-6.2.3
1112
release-6.2.2

doc/en/announce/release-6.2.5.rst

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
pytest-6.2.5
2+
=======================================
3+
4+
pytest 6.2.5 has just been released to PyPI.
5+
6+
This is a bug-fix release, being a drop-in replacement. To upgrade::
7+
8+
pip install --upgrade pytest
9+
10+
The full changelog is available at https://docs.pytest.org/en/stable/changelog.html.
11+
12+
Thanks to all of the contributors to this release:
13+
14+
* Anthony Sottile
15+
* Bruno Oliveira
16+
* Brylie Christopher Oxley
17+
* Daniel Asztalos
18+
* Florian Bruhin
19+
* Jason Haugen
20+
* MapleCCC
21+
* Michał Górny
22+
* Miro Hrončok
23+
* Ran Benita
24+
* Ronny Pfannschmidt
25+
* Sylvain Bellemare
26+
* Thomas Güttler
27+
28+
29+
Happy testing,
30+
The pytest Development Team

doc/en/assert.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ you will see the return value of the function call:
3131
3232
$ pytest test_assert1.py
3333
=========================== test session starts ============================
34-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y
34+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y
3535
cachedir: $PYTHON_PREFIX/.pytest_cache
3636
rootdir: $REGENDOC_TMPDIR
3737
collected 1 item
@@ -188,7 +188,7 @@ if you run this module:
188188
189189
$ pytest test_assert2.py
190190
=========================== test session starts ============================
191-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y
191+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y
192192
cachedir: $PYTHON_PREFIX/.pytest_cache
193193
rootdir: $REGENDOC_TMPDIR
194194
collected 1 item

doc/en/cache.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ If you then run it with ``--lf``:
8686
8787
$ pytest --lf
8888
=========================== test session starts ============================
89-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y
89+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y
9090
cachedir: $PYTHON_PREFIX/.pytest_cache
9191
rootdir: $REGENDOC_TMPDIR
9292
collected 2 items
@@ -133,7 +133,7 @@ of ``FF`` and dots):
133133
134134
$ pytest --ff
135135
=========================== test session starts ============================
136-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y
136+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y
137137
cachedir: $PYTHON_PREFIX/.pytest_cache
138138
rootdir: $REGENDOC_TMPDIR
139139
collected 50 items
@@ -277,7 +277,7 @@ You can always peek at the content of the cache using the
277277
278278
$ pytest --cache-show
279279
=========================== test session starts ============================
280-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y
280+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y
281281
cachedir: $PYTHON_PREFIX/.pytest_cache
282282
rootdir: $REGENDOC_TMPDIR
283283
cachedir: $PYTHON_PREFIX/.pytest_cache
@@ -358,7 +358,7 @@ filtering:
358358
359359
$ pytest --cache-show example/*
360360
=========================== test session starts ============================
361-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y
361+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y
362362
cachedir: $PYTHON_PREFIX/.pytest_cache
363363
rootdir: $REGENDOC_TMPDIR
364364
cachedir: $PYTHON_PREFIX/.pytest_cache

doc/en/capture.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ of the failing function and hide the other one:
8383
8484
$ pytest
8585
=========================== test session starts ============================
86-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y
86+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y
8787
cachedir: $PYTHON_PREFIX/.pytest_cache
8888
rootdir: $REGENDOC_TMPDIR
8989
collected 2 items

doc/en/changelog.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@ with advance notice in the **Deprecations** section of releases.
2828

2929
.. towncrier release notes start
3030
31+
pytest 6.2.5 (2021-08-29)
32+
Trivial/Internal Changes
33+
------------------------
34+
35+
- `#8494 <https://github.com/pytest-dev/pytest/issues/8494>`_: Python 3.10 is now supported.
36+
37+
38+
- `#9040 <https://github.com/pytest-dev/pytest/issues/9040>`_: Enable compatibility with ``pluggy 1.0`` or later.
39+
40+
3141
pytest 6.2.4 (2021-05-04)
3242
=========================
3343

doc/en/doctest.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ then you can just invoke ``pytest`` directly:
2929
3030
$ pytest
3131
=========================== test session starts ============================
32-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y
32+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y
3333
cachedir: $PYTHON_PREFIX/.pytest_cache
3434
rootdir: $REGENDOC_TMPDIR
3535
collected 1 item
@@ -58,7 +58,7 @@ and functions, including from test modules:
5858
5959
$ pytest --doctest-modules
6060
=========================== test session starts ============================
61-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y
61+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y
6262
cachedir: $PYTHON_PREFIX/.pytest_cache
6363
rootdir: $REGENDOC_TMPDIR
6464
collected 2 items

doc/en/example/markers.rst

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ You can then restrict a test run to only run tests marked with ``webtest``:
4545
4646
$ pytest -v -m webtest
4747
=========================== test session starts ============================
48-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
48+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
4949
cachedir: $PYTHON_PREFIX/.pytest_cache
5050
rootdir: $REGENDOC_TMPDIR
5151
collecting ... collected 4 items / 3 deselected / 1 selected
@@ -60,7 +60,7 @@ Or the inverse, running all tests except the webtest ones:
6060
6161
$ pytest -v -m "not webtest"
6262
=========================== test session starts ============================
63-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
63+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
6464
cachedir: $PYTHON_PREFIX/.pytest_cache
6565
rootdir: $REGENDOC_TMPDIR
6666
collecting ... collected 4 items / 1 deselected / 3 selected
@@ -82,7 +82,7 @@ tests based on their module, class, method, or function name:
8282
8383
$ pytest -v test_server.py::TestClass::test_method
8484
=========================== test session starts ============================
85-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
85+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
8686
cachedir: $PYTHON_PREFIX/.pytest_cache
8787
rootdir: $REGENDOC_TMPDIR
8888
collecting ... collected 1 item
@@ -97,7 +97,7 @@ You can also select on the class:
9797
9898
$ pytest -v test_server.py::TestClass
9999
=========================== test session starts ============================
100-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
100+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
101101
cachedir: $PYTHON_PREFIX/.pytest_cache
102102
rootdir: $REGENDOC_TMPDIR
103103
collecting ... collected 1 item
@@ -112,7 +112,7 @@ Or select multiple nodes:
112112
113113
$ pytest -v test_server.py::TestClass test_server.py::test_send_http
114114
=========================== test session starts ============================
115-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
115+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
116116
cachedir: $PYTHON_PREFIX/.pytest_cache
117117
rootdir: $REGENDOC_TMPDIR
118118
collecting ... collected 2 items
@@ -156,7 +156,7 @@ The expression matching is now case-insensitive.
156156
157157
$ pytest -v -k http # running with the above defined example module
158158
=========================== test session starts ============================
159-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
159+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
160160
cachedir: $PYTHON_PREFIX/.pytest_cache
161161
rootdir: $REGENDOC_TMPDIR
162162
collecting ... collected 4 items / 3 deselected / 1 selected
@@ -171,7 +171,7 @@ And you can also run all tests except the ones that match the keyword:
171171
172172
$ pytest -k "not send_http" -v
173173
=========================== test session starts ============================
174-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
174+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
175175
cachedir: $PYTHON_PREFIX/.pytest_cache
176176
rootdir: $REGENDOC_TMPDIR
177177
collecting ... collected 4 items / 1 deselected / 3 selected
@@ -188,7 +188,7 @@ Or to select "http" and "quick" tests:
188188
189189
$ pytest -k "http or quick" -v
190190
=========================== test session starts ============================
191-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
191+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
192192
cachedir: $PYTHON_PREFIX/.pytest_cache
193193
rootdir: $REGENDOC_TMPDIR
194194
collecting ... collected 4 items / 2 deselected / 2 selected
@@ -397,7 +397,7 @@ the test needs:
397397
398398
$ pytest -E stage2
399399
=========================== test session starts ============================
400-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y
400+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y
401401
cachedir: $PYTHON_PREFIX/.pytest_cache
402402
rootdir: $REGENDOC_TMPDIR
403403
collected 1 item
@@ -412,7 +412,7 @@ and here is one that specifies exactly the environment needed:
412412
413413
$ pytest -E stage1
414414
=========================== test session starts ============================
415-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y
415+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y
416416
cachedir: $PYTHON_PREFIX/.pytest_cache
417417
rootdir: $REGENDOC_TMPDIR
418418
collected 1 item
@@ -605,7 +605,7 @@ then you will see two tests skipped and two executed tests as expected:
605605
606606
$ pytest -rs # this option reports skip reasons
607607
=========================== test session starts ============================
608-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y
608+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y
609609
cachedir: $PYTHON_PREFIX/.pytest_cache
610610
rootdir: $REGENDOC_TMPDIR
611611
collected 4 items
@@ -622,7 +622,7 @@ Note that if you specify a platform via the marker-command line option like this
622622
623623
$ pytest -m linux
624624
=========================== test session starts ============================
625-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y
625+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y
626626
cachedir: $PYTHON_PREFIX/.pytest_cache
627627
rootdir: $REGENDOC_TMPDIR
628628
collected 4 items / 3 deselected / 1 selected
@@ -686,7 +686,7 @@ We can now use the ``-m option`` to select one set:
686686
687687
$ pytest -m interface --tb=short
688688
=========================== test session starts ============================
689-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y
689+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y
690690
cachedir: $PYTHON_PREFIX/.pytest_cache
691691
rootdir: $REGENDOC_TMPDIR
692692
collected 4 items / 2 deselected / 2 selected
@@ -713,7 +713,7 @@ or to select both "event" and "interface" tests:
713713
714714
$ pytest -m "interface or event" --tb=short
715715
=========================== test session starts ============================
716-
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y
716+
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-1.x.y
717717
cachedir: $PYTHON_PREFIX/.pytest_cache
718718
rootdir: $REGENDOC_TMPDIR
719719
collected 4 items / 1 deselected / 3 selected

0 commit comments

Comments
 (0)