Merge pull request #3602 from nicoddemus/release-3.6.2

Release 3.6.2

CHANGELOG.rst

@@ -8,6 +8,52 @@
 
 .. towncrier release notes start
 
+Pytest 3.6.2 (2018-06-20)
+=========================
+
+Bug Fixes
+---------
+
+- Fix regression in ``Node.add_marker`` by extracting the mark object of a
+  ``MarkDecorator``. (`#3555
+  <https://github.com/pytest-dev/pytest/issues/3555>`_)
+
+- Warnings without ``location`` were reported as ``None``. This is corrected to
+  now report ``<undetermined location>``. (`#3563
+  <https://github.com/pytest-dev/pytest/issues/3563>`_)
+
+- Continue to call finalizers in the stack when a finalizer in a former scope
+  raises an exception. (`#3569
+  <https://github.com/pytest-dev/pytest/issues/3569>`_)
+
+- Fix encoding error with `print` statements in doctests (`#3583
+  <https://github.com/pytest-dev/pytest/issues/3583>`_)
+
+
+Improved Documentation
+----------------------
+
+- Add documentation for the ``--strict`` flag. (`#3549
+  <https://github.com/pytest-dev/pytest/issues/3549>`_)
+
+
+Trivial/Internal Changes
+------------------------
+
+- Update old quotation style to parens in fixture.rst documentation. (`#3525
+  <https://github.com/pytest-dev/pytest/issues/3525>`_)
+
+- Improve display of hint about ``--fulltrace`` with ``KeyboardInterrupt``.
+  (`#3545 <https://github.com/pytest-dev/pytest/issues/3545>`_)
+
+- pytest's testsuite is no longer runnable through ``python setup.py test`` --
+  instead invoke ``pytest`` or ``tox`` directly. (`#3552
+  <https://github.com/pytest-dev/pytest/issues/3552>`_)
+
+- Fix typo in documentation (`#3567
+  <https://github.com/pytest-dev/pytest/issues/3567>`_)
+
+
 Pytest 3.6.1 (2018-06-05)
 =========================
 

changelog/3525.trivial.rst

@@ -1 +0,0 @@
-Update old quotation style to parens in fixture.rst documentation.

changelog/3545.trivial.rst

@@ -1 +0,0 @@
-Improve display of hint about ``--fulltrace`` with ``KeyboardInterrupt``.

changelog/3549.doc.rst

@@ -1 +0,0 @@
-Add documentation for the ``--strict`` flag.

changelog/3552.trivial.rst

@@ -1 +0,0 @@
-pytest's testsuite is no longer runnable through ``python setup.py test`` -- instead invoke ``pytest`` or ``tox`` directly.

changelog/3555.bugfix.rst

@@ -1 +0,0 @@
-Fix regression in ``Node.add_marker`` by extracting the mark object of a ``MarkDecorator``.

changelog/3563.bugfix.rst

@@ -1 +0,0 @@
-Warnings without ``location`` were reported as ``None``.  This is corrected to now report ``<undetermined location>``.

changelog/3567.trivial.rst

@@ -1 +0,0 @@
-Fix typo in documentation

changelog/3569.bugfix.rst

@@ -1 +0,0 @@
-Continue to call finalizers in the stack when a finalizer in a former scope raises an exception.

changelog/3583.bugfix.rst

@@ -1 +0,0 @@
-Fix encoding error with `print` statements in doctests

doc/en/announce/index.rst

@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
+   release-3.6.2
    release-3.6.1
    release-3.6.0
    release-3.5.1

doc/en/announce/release-3.6.2.rst

@@ -0,0 +1,29 @@
+pytest-3.6.2
+=======================================
+
+pytest 3.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 http://doc.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Alan Velasco
+* Alex Barbato
+* Anthony Sottile
+* Bartosz Cierocki
+* Bruno Oliveira
+* Daniel Hahler
+* Guoqiang Zhang
+* Hynek Schlawack
+* John T. Wodder II
+* Michael Käufl
+* Ronny Pfannschmidt
+* Samuel Dion-Girardeau
+
+
+Happy testing,
+The pytest Development Team

doc/en/example/reportingdemo.rst

@@ -625,7 +625,7 @@ get on the terminal - we are working on that)::
 
     failure_demo.py:278: AssertionError
     ============================= warnings summary =============================
-    None
+    <undetermined location>
       Metafunc.addcall is deprecated and scheduled to be removed in pytest 4.0.
       Please use Metafunc.parametrize instead.