Daniel Hahler b5b710b3ae 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:52:51 +02:00
..
test_code.py	pre-commit run pyupgrade --all-files	2019-06-03 12:08:02 -03:00
test_excinfo.py	Merge master into features	2019-08-02 16:52:51 +02:00
test_source.py	Clean up u' prefixes and py2 bytes conversions	2019-06-04 17:50:34 -07:00