summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog/8152.bugfix.rst1
-rw-r--r--changelog/8249.bugfix.rst1
-rw-r--r--doc/en/announce/index.rst1
-rw-r--r--doc/en/announce/release-6.2.2.rst21
-rw-r--r--doc/en/changelog.rst12
-rw-r--r--doc/en/example/parametrize.rst4
-rw-r--r--doc/en/getting-started.rst2
7 files changed, 37 insertions, 5 deletions
diff --git a/changelog/8152.bugfix.rst b/changelog/8152.bugfix.rst
deleted file mode 100644
index d79a832de..000000000
--- a/changelog/8152.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed "(<Skipped instance>)" being shown as a skip reason in the verbose test summary line when the reason is empty.
diff --git a/changelog/8249.bugfix.rst b/changelog/8249.bugfix.rst
deleted file mode 100644
index aa084c757..000000000
--- a/changelog/8249.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix the ``faulthandler`` plugin for occasions when running with ``twisted.logger`` and using ``pytest --capture=no``.
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
index e7cac2a1c..a7656c5ee 100644
--- a/doc/en/announce/index.rst
+++ b/doc/en/announce/index.rst
@@ -6,6 +6,7 @@ Release announcements
:maxdepth: 2
+ release-6.2.2
release-6.2.1
release-6.2.0
release-6.1.2
diff --git a/doc/en/announce/release-6.2.2.rst b/doc/en/announce/release-6.2.2.rst
new file mode 100644
index 000000000..c3999c538
--- /dev/null
+++ b/doc/en/announce/release-6.2.2.rst
@@ -0,0 +1,21 @@
+pytest-6.2.2
+=======================================
+
+pytest 6.2.2 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+ pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/stable/changelog.html.
+
+Thanks to all of the contributors to this release:
+
+* Adam Johnson
+* Bruno Oliveira
+* Chris NeJame
+* Ran Benita
+
+
+Happy testing,
+The pytest Development Team
diff --git a/doc/en/changelog.rst b/doc/en/changelog.rst
index 6d66ad1d8..3e854f599 100644
--- a/doc/en/changelog.rst
+++ b/doc/en/changelog.rst
@@ -28,6 +28,18 @@ with advance notice in the **Deprecations** section of releases.
.. towncrier release notes start
+pytest 6.2.2 (2021-01-25)
+=========================
+
+Bug Fixes
+---------
+
+- `#8152 <https://github.com/pytest-dev/pytest/issues/8152>`_: Fixed "(<Skipped instance>)" being shown as a skip reason in the verbose test summary line when the reason is empty.
+
+
+- `#8249 <https://github.com/pytest-dev/pytest/issues/8249>`_: Fix the ``faulthandler`` plugin for occasions when running with ``twisted.logger`` and using ``pytest --capture=no``.
+
+
pytest 6.2.1 (2020-12-15)
=========================
diff --git a/doc/en/example/parametrize.rst b/doc/en/example/parametrize.rst
index a65ee5f2f..771c7e16f 100644
--- a/doc/en/example/parametrize.rst
+++ b/doc/en/example/parametrize.rst
@@ -637,13 +637,13 @@ Then run ``pytest`` with verbose mode and with only the ``basic`` marker:
platform linux -- Python 3.x.y, pytest-6.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
cachedir: $PYTHON_PREFIX/.pytest_cache
rootdir: $REGENDOC_TMPDIR
- collecting ... collected 14 items / 11 deselected / 3 selected
+ collecting ... collected 24 items / 21 deselected / 3 selected
test_pytest_param_example.py::test_eval[1+7-8] PASSED [ 33%]
test_pytest_param_example.py::test_eval[basic_2+4] PASSED [ 66%]
test_pytest_param_example.py::test_eval[basic_6*9] XFAIL [100%]
- =============== 2 passed, 11 deselected, 1 xfailed in 0.12s ================
+ =============== 2 passed, 21 deselected, 1 xfailed in 0.12s ================
As the result:
diff --git a/doc/en/getting-started.rst b/doc/en/getting-started.rst
index 09410585d..1275dff90 100644
--- a/doc/en/getting-started.rst
+++ b/doc/en/getting-started.rst
@@ -28,7 +28,7 @@ Install ``pytest``
.. code-block:: bash
$ pytest --version
- pytest 6.2.1
+ pytest 6.2.2
.. _`simpletest`: