Merge master into features

Several conflicts, mostly due to 2c402f4bd. Conflicts: .pre-commit-config.yaml src/_pytest/outcomes.py src/_pytest/python_api.py tox.ini
2019-08-02 16:20:21 +02:00
parent 4abf95ba4f 0d3958e8de
commit b5b710b3ae
66 changed files with 626 additions and 235 deletions
--- a/src/_pytest/python_api.py
+++ b/src/_pytest/python_api.py
@@ -579,7 +579,7 @@ def raises(
        string that may contain `special characters`__, the pattern can
        first be escaped with ``re.escape``.

-    __ https://docs.python.org/3/library/re.html#regular-expression-syntax
+        __ https://docs.python.org/3/library/re.html#regular-expression-syntax


    .. currentmodule:: _pytest._code