Merge remote-tracking branch 'upstream/master' into merge-master-into-features

# Conflicts: # AUTHORS # CHANGELOG.rst # _pytest/pytester.py
2017-03-10 15:54:05 -03:00
parent 0c94f517a1 906b40fbb2
commit 1e0cf5ce4d
33 changed files with 310 additions and 97 deletions
@@ -287,5 +287,5 @@ For further information, Benjamin Peterson wrote up `Behind the scenes of pytest
   ``--nomagic``.

 .. versionchanged:: 3.0
-   Removes the ``--no-assert`` and``--nomagic`` options.
+   Removes the ``--no-assert`` and ``--nomagic`` options.
   Removes the ``--assert=reinterp`` option.