Merge master into features - #6569

Merged

blueyed merged 7 commits into

pytest-dev:featuresfrom

blueyed:merge-master-into-features

Jan 25, 2020

Commits on Jan 25, 2020

Fix EncodedFile.write return value

gavento
and
nicoddemus
committed
5e15c86
Merge pull request #6558 from gavento/patch-1
blueyed
authored
6f2943c
ci: codecov: only use "comment: off"
blueyed
committed
a29d619
Merge pull request #6567 from blueyed/codecov-config
blueyed
authored
0d55fb3
Remove a couple of redundant commas

bluetech
authored and
blueyed
committed
94d8c07
Merge pull request #6568 from bluetech/redundant-commas
blueyed
authored
2da331e
Merge master into features
blueyed
committed
c51173d