Daniel Hahler 4e45472405 Merge master into features ...

Conflicts:
	src/_pytest/debugging.py

2019-11-06 14:22:07 +01:00

..

approx.py

tests: lazily import doctest in approx tests

2019-10-28 12:55:16 +01:00

collect.py

Fix plurality mismatch for and in pytest terminal summary

2019-10-27 15:16:24 +00:00

fixtures.py

Fix plurality mismatch for and in pytest terminal summary

2019-10-27 15:16:24 +00:00

integration.py

copy test and changelog from #5607 by @niccodemus

2019-07-20 20:21:27 +02:00

metafunc.py

typos

2019-10-31 23:19:35 -05:00

raises.py

Fix coverage

2019-08-20 15:41:32 +03:00

show_fixtures_per_test.py

Use new no-match functions to replace previous idiom

2019-10-06 18:05:24 -03:00