Merge master into features - #5741

Closed

nicoddemus wants to merge 13 commits into

pytest-dev:featuresfrom

Commits on Aug 9, 2019

Improve docs of pytest.importorskip
timhoffm
committed
b095e0d
Improve docs of pytest.importorskip (#5718)
nicoddemus
authored
8ffa3aa
pytester: add docstrings for Testdir.copy_example
martbln
committed
e0ce8b7

Commits on Aug 10, 2019

Commits on Aug 12, 2019

remove %s formatting from docs
boris
committed
3eb4973
remove %s formatting from docs (#5733)
nicoddemus
authored
3b3ce0e
test_non_ascii_paste_text: mock call to urlopen (#5728)
nicoddemus
authored
a295a3d

Commits on Aug 14, 2019

Merge remote-tracking branch 'upstream/master' into mm
nicoddemus
committed
cc33fb6
Apply suggestions from code review

nicoddemus
and
blueyed
authored
998da2c