Victor Maryama 6f851e6cbb Merge remote-tracking branch 'upstream/master' into features-assertion-pass-hook-master ... # Conflicts: # src/_pytest/assertion/rewrite.py		2019-06-26 18:12:56 +02:00
..
approx.py	pre-commit run pyupgrade --all-files	2019-06-03 12:08:02 -03:00
collect.py	initial conversion of exit codes to enum	2019-06-15 06:48:00 +02:00
fixtures.py	small mypy fixes	2019-06-06 09:13:02 -07:00
integration.py	pre-commit run pyupgrade --all-files	2019-06-03 12:08:02 -03:00
metafunc.py	Pickup additional positional args passed to _parse_parametrize_args	2019-06-24 20:43:52 -04:00
raises.py	Assertion passed hook	2019-06-24 16:09:39 +02:00
setup_only.py	pre-commit run fix-encoding-pragma --all-files	2019-06-03 12:08:01 -03:00
setup_plan.py	pre-commit run fix-encoding-pragma --all-files	2019-06-03 12:08:01 -03:00
show_fixtures_per_test.py	pre-commit run pyupgrade --all-files	2019-06-03 12:08:02 -03:00