Merge pull request #6391 from asottile/release-4.6.9 (#6403)

Merge pull request #6391 from asottile/release-4.6.9

Author: nicoddemus

doc/en/announce/index.rst

@@ -20,6 +20,7 @@ Release announcements
    release-5.1.0
    release-5.0.1
    release-5.0.0
+   release-4.6.9
    release-4.6.8
    release-4.6.7
    release-4.6.6

doc/en/announce/release-4.6.9.rst

@@ -0,0 +1,21 @@
+pytest-4.6.9
+=======================================
+
+pytest 4.6.9 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
+* Felix Yan
+* Hugo
+
+
+Happy testing,
+The pytest Development Team

doc/en/changelog.rst

@@ -815,6 +815,15 @@ Improved Documentation
 - `#5416 <https://github.com/pytest-dev/pytest/issues/5416>`_: Fix PytestUnknownMarkWarning in run/skip example.
 
 
+pytest 4.6.9 (2020-01-04)
+=========================
+
+Bug Fixes
+---------
+
+- `#6301 <https://github.com/pytest-dev/pytest/issues/6301>`_: Fix assertion rewriting for egg-based distributions and ``editable`` installs (``pip install --editable``).
+
+
 pytest 4.6.8 (2019-12-19)
 =========================