From 9657166a22013777fb57bbc35873fcae0c42f918 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Mon, 3 Jun 2019 12:19:42 -0700
Subject: [PATCH] Merge pull request #5379 from asottile/release-4.6.2

Preparing release version 4.6.2
---
 CHANGELOG.rst                     | 15 +++++++++++++++
 doc/en/announce/index.rst         |  1 +
 doc/en/announce/release-4.6.2.rst | 18 ++++++++++++++++++
 doc/en/example/simple.rst         |  2 +-
 4 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 doc/en/announce/release-4.6.2.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a2bf12d7e..715238b32 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -18,6 +18,21 @@ with advance notice in the **Deprecations** section of releases.
 
 .. towncrier release notes start
 
+pytest 4.6.2 (2019-06-03)
+=========================
+
+Bug Fixes
+---------
+
+- `#5370 <https://github.com/pytest-dev/pytest/issues/5370>`_: Revert unrolling of ``all()`` to fix ``NameError`` on nested comprehensions.
+
+
+- `#5371 <https://github.com/pytest-dev/pytest/issues/5371>`_: Revert unrolling of ``all()`` to fix incorrect handling of generators with ``if``.
+
+
+- `#5372 <https://github.com/pytest-dev/pytest/issues/5372>`_: Revert unrolling of ``all()`` to fix incorrect assertion when using ``all()`` in an expression.
+
+
 pytest 4.6.1 (2019-06-02)
 =========================
 
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
index 2c05e2e59..9379ae5b1 100644
--- a/doc/en/announce/index.rst
+++ b/doc/en/announce/index.rst
@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
+   release-4.6.2
    release-4.6.1
    release-4.6.0
    release-4.5.0
diff --git a/doc/en/announce/release-4.6.2.rst b/doc/en/announce/release-4.6.2.rst
new file mode 100644
index 000000000..8526579b9
--- /dev/null
+++ b/doc/en/announce/release-4.6.2.rst
@@ -0,0 +1,18 @@
+pytest-4.6.2
+=======================================
+
+pytest 4.6.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/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+
+
+Happy testing,
+The pytest Development Team
diff --git a/doc/en/example/simple.rst b/doc/en/example/simple.rst
index cf8298ddc..140f4b840 100644
--- a/doc/en/example/simple.rst
+++ b/doc/en/example/simple.rst
@@ -441,7 +441,7 @@ Now we can profile which test functions execute the slowest:
 
     ========================= slowest 3 test durations =========================
     0.30s call     test_some_are_slow.py::test_funcslow2
-    0.21s call     test_some_are_slow.py::test_funcslow1
+    0.20s call     test_some_are_slow.py::test_funcslow1
     0.10s call     test_some_are_slow.py::test_funcfast
     ========================= 3 passed in 0.12 seconds =========================