Daniel Hahler 09bdbffbde Merge master into features ...

Conflicts:
	src/_pytest/_code/code.py
	src/_pytest/main.py

2020-01-24 23:44:50 +01:00

..

approx.py

tests: lazily import doctest in approx tests

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

collect.py

Merge master into features

2020-01-24 23:44:50 +01:00

fixtures.py

tests: add test_fixture_arg_ordering

2020-01-24 17:48:08 -03:00

integration.py

deprecate direct node construction and introduce Node.from_parent

2019-11-23 21:54:11 +01:00

metafunc.py

Merge remote-tracking branch 'upstream/master' into mm

2020-01-22 11:03:45 -03:00

raises.py

Remove "pragma: no cover" comments

2020-01-14 09:15:36 +01:00

show_fixtures_per_test.py

Use new no-match functions to replace previous idiom

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