Preparing release version 3.6.1

Author: nicoddemus

CHANGELOG.rst

@@ -8,6 +8,43 @@
 
 .. towncrier release notes start
 
+Pytest 3.6.1 (2018-06-05)
+=========================
+
+Bug Fixes
+---------
+
+- Fixed a bug where stdout and stderr were logged twice by junitxml when a test
+  was marked xfail. (`#3491
+  <https://github.com/pytest-dev/pytest/issues/3491>`_)
+
+- Fix ``usefixtures`` mark applyed to unittest tests by correctly instantiating
+  ``FixtureInfo``. (`#3498
+  <https://github.com/pytest-dev/pytest/issues/3498>`_)
+
+- Fix assertion rewriter compatibility with libraries that monkey patch
+  ``file`` objects. (`#3503
+  <https://github.com/pytest-dev/pytest/issues/3503>`_)
+
+
+Trivial/Internal Changes
+------------------------
+
+- Enable caching for pip/pre-commit in order to reduce build time on
+  travis/appveyor. (`#3502
+  <https://github.com/pytest-dev/pytest/issues/3502>`_)
+
+- Switch pytest to the src/ layout as we already suggested it for good practice
+  - now we implement it as well. (`#3513
+  <https://github.com/pytest-dev/pytest/issues/3513>`_)
+
+- Fix if in tests to support 3.7.0b5, where a docstring handling in AST got
+  reverted. (`#3530 <https://github.com/pytest-dev/pytest/issues/3530>`_)
+
+- Remove some python2.5 compatibility code. (`#3629
+  <https://github.com/pytest-dev/pytest/issues/3629>`_)
+
+
 Pytest 3.6.0 (2018-05-23)
 =========================
 

changelog/3491.bugfix.rst

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

changelog/3498.bugfix

@@ -0,0 +1,23 @@
+pytest-3.6.1
+=======================================
+
+pytest 3.6.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 http://doc.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Anthony Sottile
+* Bruno Oliveira
+* Jeffrey Rackauckas
+* Miro Hrončok
+* Oliver Bestwalter
+* Ronny Pfannschmidt
+
+
+Happy testing,
+The pytest Development Team

changelog/3502.trivial.rst

@@ -29,17 +29,17 @@ you will see the return value of the function call::
     platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
     rootdir: $REGENDOC_TMPDIR, inifile:
     collected 1 item
-
+    
     test_assert1.py F                                                    [100%]
-
+    
     ================================= FAILURES =================================
     ______________________________ test_function _______________________________
-
+    
         def test_function():
     >       assert f() == 4
     E       assert 3 == 4
     E        +  where 3 = f()
-
+    
     test_assert1.py:5: AssertionError
     ========================= 1 failed in 0.12 seconds =========================
 
@@ -172,12 +172,12 @@ if you run this module::
     platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
     rootdir: $REGENDOC_TMPDIR, inifile:
     collected 1 item
-
+    
     test_assert2.py F                                                    [100%]
-
+    
     ================================= FAILURES =================================
     ___________________________ test_set_comparison ____________________________
-
+    
         def test_set_comparison():
             set1 = set("1308")
             set2 = set("8035")
@@ -188,7 +188,7 @@ if you run this module::
     E         Extra items in the right set:
     E         '5'
     E         Use -v to get the full diff
-
+    
     test_assert2.py:5: AssertionError
     ========================= 1 failed in 0.12 seconds =========================
 
@@ -241,14 +241,14 @@ the conftest file::
    F                                                                    [100%]
    ================================= FAILURES =================================
    _______________________________ test_compare _______________________________
-
+   
        def test_compare():
            f1 = Foo(1)
            f2 = Foo(2)
    >       assert f1 == f2
    E       assert Comparing Foo instances:
    E            vals: 1 != 2
-
+   
    test_foocompare.py:11: AssertionError
    1 failed in 0.12 seconds
 

changelog/3503.bugfix.rst

@@ -17,13 +17,13 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
     $ pytest -q --fixtures
     cache
         Return a cache object that can persist state between testing sessions.
-
+        
         cache.get(key, default)
         cache.set(key, value)
-
+        
         Keys must be a ``/`` separated value, where the first part is usually the
         name of your plugin or application to avoid clashes with other cache users.
-
+        
         Values can be any object handled by the json stdlib module.
     capsys
         Enable capturing of writes to ``sys.stdout`` and ``sys.stderr`` and make
@@ -49,9 +49,9 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
         Fixture that returns a :py:class:`dict` that will be injected into the namespace of doctests.
     pytestconfig
         Session-scoped fixture that returns the :class:`_pytest.config.Config` object.
-
+        
         Example::
-
+        
             def test_foo(pytestconfig):
                 if pytestconfig.getoption("verbose"):
                     ...
@@ -61,9 +61,9 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
         configured reporters, like JUnit XML.
         The fixture is callable with ``(name, value)``, with value being automatically
         xml-encoded.
-
+        
         Example::
-
+        
             def test_function(record_property):
                 record_property("example_key", 1)
     record_xml_property
@@ -74,17 +74,17 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
         automatically xml-encoded
     caplog
         Access and control log capturing.
-
+        
         Captured logs are available through the following methods::
-
+        
         * caplog.text            -> string containing formatted log output
         * caplog.records         -> list of logging.LogRecord instances
         * caplog.record_tuples   -> list of (logger_name, level, message) tuples
         * caplog.clear()         -> clear captured records and formatted log output string
     monkeypatch
         The returned ``monkeypatch`` fixture provides these
         helper methods to modify objects, dictionaries or os.environ::
-
+        
             monkeypatch.setattr(obj, name, value, raising=True)
             monkeypatch.delattr(obj, name, raising=True)
             monkeypatch.setitem(mapping, name, value)
@@ -93,14 +93,14 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
             monkeypatch.delenv(name, value, raising=True)
             monkeypatch.syspath_prepend(path)
             monkeypatch.chdir(path)
-
+        
         All modifications will be undone after the requesting
         test function or fixture has finished. The ``raising``
         parameter determines if a KeyError or AttributeError
         will be raised if the set/deletion operation has no target.
     recwarn
         Return a :class:`WarningsRecorder` instance that records all warnings emitted by test functions.
-
+        
         See http://docs.python.org/library/warnings.html for information
         on warning categories.
     tmpdir_factory
@@ -111,9 +111,9 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
         created as a sub directory of the base temporary
         directory.  The returned object is a `py.path.local`_
         path object.
-
+        
         .. _`py.path.local`: https://py.readthedocs.io/en/latest/path.html
-
+    
     no tests ran in 0.12 seconds
 
 You can also interactively ask for help, e.g. by typing on the Python interactive prompt something like::