Daniel Hahler 83813bf515 Merge master into features ... Conflicts: .github/workflows/main.yml		2020-01-16 19:45:52 +01:00
..
approx.py	tests: lazily import doctest in approx tests	2019-10-28 12:55:16 +01:00
collect.py	deprecate direct node construction and introduce Node.from_parent	2019-11-23 21:54:11 +01:00
fixtures.py	fixtures register finalizers with all fixtures before them in the stack	2020-01-15 11:00:42 -05:00
integration.py	deprecate direct node construction and introduce Node.from_parent	2019-11-23 21:54:11 +01:00
metafunc.py	deprecate direct node construction and introduce Node.from_parent	2019-11-23 21:54:11 +01: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