Merge master into features#4338

Merged

blueyed merged 21 commits intopytest-dev:featuresfrom

blueyed:merge-master

Nov 8, 2018

Commits on Nov 5, 2018

Merge pull request #4305 from RonnyPfannschmidt/cleanup-tobytes
Anthony Sottile
authored
Don't string-compare version numbers
Anthony Sottile
committed
Merge pull request #4302 from jdufresne/pypi
Anthony Sottile
authored
Use unicode/bytes literals instead of calls
Anthony Sottile
committed
Merge pull request #4309 from asottile/less_unicode_hax
RonnyPfannschmidt
authored
Add missing `-` in front of the new option `--sw`
Lothiraldan
authored
Merge pull request #4312 from Lothiraldan/patch-1
nicoddemus
authored
Merge pull request #4308 from asottile/compare_versions_with_loose_version
Anthony Sottile
authored

Commits on Nov 8, 2018

Merge branch 'master' into features
blueyed
committed