From 844d660d5cab2c1c0ade5aba4b19ccc359154404 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Fri, 28 Jun 2019 19:09:10 -0700
Subject: [PATCH] Merge pull request #5520 from asottile/release-4.6.4

Preparing release version 4.6.4
---
 CHANGELOG.rst                     | 20 ++++++++++++++++++++
 doc/en/announce/index.rst         |  1 +
 doc/en/announce/release-4.6.4.rst | 22 ++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 doc/en/announce/release-4.6.4.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1ad0a155506..6e5e8985af4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -203,6 +203,26 @@ Improved Documentation
 - `#5416 <https://github.com/pytest-dev/pytest/issues/5416>`_: Fix PytestUnknownMarkWarning in run/skip example.
 
 
+pytest 4.6.4 (2019-06-28)
+=========================
+
+Bug Fixes
+---------
+
+- `#5404 <https://github.com/pytest-dev/pytest/issues/5404>`_: Emit a warning when attempting to unwrap a broken object raises an exception,
+  for easier debugging (`#5080 <https://github.com/pytest-dev/pytest/issues/5080>`__).
+
+
+- `#5444 <https://github.com/pytest-dev/pytest/issues/5444>`_: Fix ``--stepwise`` mode when the first file passed on the command-line fails to collect.
+
+
+- `#5482 <https://github.com/pytest-dev/pytest/issues/5482>`_: Fix bug introduced in 4.6.0 causing collection errors when passing
+  more than 2 positional arguments to ``pytest.mark.parametrize``.
+
+
+- `#5505 <https://github.com/pytest-dev/pytest/issues/5505>`_: Fix crash when discovery fails while using ``-p no:terminal``.
+
+
 pytest 4.6.3 (2019-06-11)
 =========================
 
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
index c8247ceb37b..700e5361cf9 100644
--- a/doc/en/announce/index.rst
+++ b/doc/en/announce/index.rst
@@ -7,6 +7,7 @@ Release announcements
 
 
    release-5.0.0
+   release-4.6.4
    release-4.6.3
    release-4.6.2
    release-4.6.1
diff --git a/doc/en/announce/release-4.6.4.rst b/doc/en/announce/release-4.6.4.rst
new file mode 100644
index 00000000000..7b35ed4f0d4
--- /dev/null
+++ b/doc/en/announce/release-4.6.4.rst
@@ -0,0 +1,22 @@
+pytest-4.6.4
+=======================================
+
+pytest 4.6.4 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
+* Bruno Oliveira
+* Daniel Hahler
+* Thomas Grainger
+* Zac Hatfield-Dodds
+
+
+Happy testing,
+The pytest Development Team