Merge pull request #8149 from pytest-dev/release-6.2.1

Prepare release 6.2.1

(cherry picked from commit a566eb9c7085d7732127420bd7ce5ec1f7319fba)

6 files changed, 44 insertions, 13 deletions

diff --git a/changelog/7678.bugfix.rst b/changelog/7678.bugfix.rst
deleted file mode 100644
index 4adc6ffd1..000000000
--- a/changelog/7678.bugfix.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed bug where ``ImportPathMismatchError`` would be raised for files compiled in
-the host and loaded later from an UNC mounted path (Windows).
diff --git a/changelog/8132.bugfix.rst b/changelog/8132.bugfix.rst
deleted file mode 100644
index 5be5e5674..000000000
--- a/changelog/8132.bugfix.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Fixed regression in ``approx``: in 6.2.0 ``approx`` no longer raises
-``TypeError`` when dealing with non-numeric types, falling back to normal comparison.
-Before 6.2.0, array types like tf.DeviceArray fell through to the scalar case,
-and happened to compare correctly to a scalar if they had only one element.
-After 6.2.0, these types began failing, because they inherited neither from
-standard Python number hierarchy nor from ``numpy.ndarray``.
-
-``approx`` now converts arguments to ``numpy.ndarray`` if they expose the array
-protocol and are not scalars. This treats array-like objects like numpy arrays,
-regardless of size.
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
index 003a0a1a9..e7cac2a1c 100644
--- a/doc/en/announce/index.rst
+++ b/doc/en/announce/index.rst
@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
+   release-6.2.1
    release-6.2.0
    release-6.1.2
    release-6.1.1
diff --git a/doc/en/announce/release-6.2.1.rst b/doc/en/announce/release-6.2.1.rst
new file mode 100644
index 000000000..f9e716183
--- /dev/null
+++ b/doc/en/announce/release-6.2.1.rst
@@ -0,0 +1,20 @@
+pytest-6.2.1
+=======================================
+
+pytest 6.2.1 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:
+
+* Bruno Oliveira
+* Jakob van Santen
+* Ran Benita
+
+
+Happy testing,
+The pytest Development Team
diff --git a/doc/en/changelog.rst b/doc/en/changelog.rst
index 77340b1bb..6d66ad1d8 100644
--- a/doc/en/changelog.rst
+++ b/doc/en/changelog.rst
@@ -28,6 +28,28 @@ with advance notice in the **Deprecations** section of releases.
 
 .. towncrier release notes start
 
+pytest 6.2.1 (2020-12-15)
+=========================
+
+Bug Fixes
+---------
+
+- `#7678 <https://github.com/pytest-dev/pytest/issues/7678>`_: Fixed bug where ``ImportPathMismatchError`` would be raised for files compiled in
+  the host and loaded later from an UNC mounted path (Windows).
+
+
+- `#8132 <https://github.com/pytest-dev/pytest/issues/8132>`_: Fixed regression in ``approx``: in 6.2.0 ``approx`` no longer raises
+  ``TypeError`` when dealing with non-numeric types, falling back to normal comparison.
+  Before 6.2.0, array types like tf.DeviceArray fell through to the scalar case,
+  and happened to compare correctly to a scalar if they had only one element.
+  After 6.2.0, these types began failing, because they inherited neither from
+  standard Python number hierarchy nor from ``numpy.ndarray``.
+
+  ``approx`` now converts arguments to ``numpy.ndarray`` if they expose the array
+  protocol and are not scalars. This treats array-like objects like numpy arrays,
+  regardless of size.
+
+
 pytest 6.2.0 (2020-12-12)
 =========================
 
diff --git a/doc/en/getting-started.rst b/doc/en/getting-started.rst
index fe15c218c..09410585d 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.0
+    pytest 6.2.1
 
 .. _`simpletest`: