Merge master into features#3831

Merged

nicoddemus merged 58 commits intopytest-dev:featuresfrom

nicoddemus:merge-master-into-features

Aug 18, 2018

Commits on Aug 2, 2018

tox: clean up docs target
blueyed
committed

Commits on Aug 3, 2018

Commits on Aug 4, 2018

Commits on Aug 5, 2018

Commits on Aug 6, 2018

Merge pull request #3771 from nicoddemus/package-infinite-recursion-bug
nicoddemus
authored

Commits on Aug 8, 2018

Fix AttributeError bug in TestCaseFunction.teardown by creating TestCaseFunction._testcase as attribute of class with a None default.
westhomas
committed
Trimming Trailing Whitespace
westhomas
committed

Commits on Aug 10, 2018

Fix #3751

turturica
authored and
turturica
committed
Improve warning messages when addoption is called with string as `type`
nicoddemus
committed
Fix test collection from packages mixed with directories. #3768 and #3789

turturica
authored and
turturica
committed
Add a test description.

turturica
authored and
turturica
committed
Fix docs formatting and improve test a bit
nicoddemus
committed

Commits on Aug 11, 2018

Add test for packages mixed with modules.

turturica
authored and
turturica
committed
Add CHANGELOG entries
nicoddemus
committed
Unhide documentation for metafunc.config
keysmashes
committed

Commits on Aug 13, 2018

Merge pull request #3807 from anowlcalledjosh/metafunc-config-doc
asottile
authored

Commits on Aug 15, 2018

Commits on Aug 16, 2018

Commits on Aug 17, 2018

Commits on Aug 18, 2018