Merge remote-tracking branch 'upstream/master' into release-1.22.5

tox.ini

@@ -1,11 +1,10 @@
 [tox]
 # if you change the envlist, please update .travis.yml file as well
 envlist=
+  linting
   py{27,34,35,36}-pytest{30,31,32,33,36}
-  py{27,36}-pytest{30,36}-pexpect
+  py{27,36}-pytest36-pexpect
   py{27,36}-pytest{master,features}
-  flakes
-  readme
 
 
 [testenv]
@@ -30,16 +29,12 @@ commands=
   py.cleanup -aq
   pytest {posargs}
 
-[testenv:flakes]
-changedir=
-deps = flake8
-commands = flake8 setup.py testing xdist
-
-[testenv:readme]
-changedir =
-deps = readme
-skip_install = true
-commands = python setup.py check -r -s
+[testenv:linting]
+skipsdist = True
+usedevelop = True
+deps =
+  pre-commit
+commands = pre-commit run --all-files --show-diff-on-failure
 
 [testenv:release]
 changedir=
@@ -56,3 +51,6 @@ commands =
 [pytest]
 addopts = -rsfxX
 
+[flake8]
+max-line-length = 120
+ignore = E203,W503