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

..

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

Make 'request' a reserved name for fixtures

2019-06-30 13:31:39 -03:00

integration.py

copy test and changelog from #5607 by @niccodemus

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

metafunc.py

refactor resolve_arg_value_types

2019-07-13 08:13:46 +02:00

raises.py

Revert "Let context-managers for raises and warns handle unknown keyword arguments"

2019-07-14 14:28:21 +03: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