Preparing release version 3.10.1

12 files changed, 62 insertions, 12 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 64a955198..c537d6b79 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -18,6 +18,40 @@ with advance notice in the **Deprecations** section of releases.
 
 .. towncrier release notes start
 
+pytest 3.10.1 (2018-11-11)
+==========================
+
+Bug Fixes
+---------
+
+- `#4287 <https://github.com/pytest-dev/pytest/issues/4287>`_: Fix nested usage of debugging plugin (pdb), e.g. with pytester's ``testdir.runpytest``.
+
+
+- `#4304 <https://github.com/pytest-dev/pytest/issues/4304>`_: Block the ``stepwise`` plugin if ``cacheprovider`` is also blocked, as one depends on the other.
+
+
+- `#4306 <https://github.com/pytest-dev/pytest/issues/4306>`_: Parse ``minversion`` as an actual version and not as dot-separated strings.
+
+
+- `#4310 <https://github.com/pytest-dev/pytest/issues/4310>`_: Fix duplicate collection due to multiple args matching the same packages.
+
+
+- `#4321 <https://github.com/pytest-dev/pytest/issues/4321>`_: Fix ``item.nodeid`` with resolved symlinks.
+
+
+- `#4325 <https://github.com/pytest-dev/pytest/issues/4325>`_: Fix collection of direct symlinked files, where the target does not match ``python_files``.
+
+
+- `#4329 <https://github.com/pytest-dev/pytest/issues/4329>`_: Fix TypeError in report_collect with _collect_report_last_write.
+
+
+
+Trivial/Internal Changes
+------------------------
+
+- `#4305 <https://github.com/pytest-dev/pytest/issues/4305>`_: Replace byte/unicode helpers in test_capture with python level syntax.
+
+
 pytest 3.10.0 (2018-11-03)
 ==========================
 
diff --git a/changelog/4287.bugfix.rst b/changelog/4287.bugfix.rst
deleted file mode 100644
index 5ba5fbb7a..000000000
--- a/changelog/4287.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix nested usage of debugging plugin (pdb), e.g. with pytester's ``testdir.runpytest``.
diff --git a/changelog/4304.bugfix.rst b/changelog/4304.bugfix.rst
deleted file mode 100644
index 7d4dc033e..000000000
--- a/changelog/4304.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Block the ``stepwise`` plugin if ``cacheprovider`` is also blocked, as one depends on the other.
diff --git a/changelog/4305.trivial.rst b/changelog/4305.trivial.rst
deleted file mode 100644
index 2430a5f91..000000000
--- a/changelog/4305.trivial.rst
+++ /dev/null
@@ -1 +0,0 @@
-Replace byte/unicode helpers in test_capture with python level syntax.
diff --git a/changelog/4306.bugfix.rst b/changelog/4306.bugfix.rst
deleted file mode 100644
index cb2872d3f..000000000
--- a/changelog/4306.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Parse ``minversion`` as an actual version and not as dot-separated strings.
diff --git a/changelog/4310.bugfix.rst b/changelog/4310.bugfix.rst
deleted file mode 100644
index 24e177c2e..000000000
--- a/changelog/4310.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix duplicate collection due to multiple args matching the same packages.
diff --git a/changelog/4321.bugfix.rst b/changelog/4321.bugfix.rst
deleted file mode 100644
index 8bfa9efde..000000000
--- a/changelog/4321.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix ``item.nodeid`` with resolved symlinks.
diff --git a/changelog/4325.bugfix.rst b/changelog/4325.bugfix.rst
deleted file mode 100644
index 71f13f429..000000000
--- a/changelog/4325.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix collection of direct symlinked files, where the target does not match ``python_files``.
diff --git a/changelog/4329.bugfix.rst b/changelog/4329.bugfix.rst
deleted file mode 100644
index 6acfe7e61..000000000
--- a/changelog/4329.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix TypeError in report_collect with _collect_report_last_write.
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
index 8f583c5f5..e0df8eb1d 100644
--- a/doc/en/announce/index.rst
+++ b/doc/en/announce/index.rst
@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
+   release-3.10.1
    release-3.10.0
    release-3.9.3
    release-3.9.2
diff --git a/doc/en/announce/release-3.10.1.rst b/doc/en/announce/release-3.10.1.rst
new file mode 100644
index 000000000..556b24ae1
--- /dev/null
+++ b/doc/en/announce/release-3.10.1.rst
@@ -0,0 +1,24 @@
+pytest-3.10.1
+=======================================
+
+pytest 3.10.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/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Boris Feld
+* Bruno Oliveira
+* Daniel Hahler
+* Fabien ZARIFIAN
+* Jon Dufresne
+* Ronny Pfannschmidt
+
+
+Happy testing,
+The pytest Development Team
diff --git a/doc/en/example/nonpython.rst b/doc/en/example/nonpython.rst
index 8bcb75b43..bda15065a 100644
--- a/doc/en/example/nonpython.rst
+++ b/doc/en/example/nonpython.rst
@@ -85,9 +85,8 @@ interesting to just look at the collection tree::
     rootdir: $REGENDOC_TMPDIR/nonpython, inifile:
     collected 2 items
     <Package '$REGENDOC_TMPDIR/nonpython'>
-      <Package '$REGENDOC_TMPDIR/nonpython'>
-        <YamlFile 'test_simple.yml'>
-          <YamlItem 'hello'>
-          <YamlItem 'ok'>
+      <YamlFile 'test_simple.yml'>
+        <YamlItem 'hello'>
+        <YamlItem 'ok'>
 
     ======================= no tests ran in 0.12 seconds =======================