Merge pull request #2844 from hugovk/pep8-to-pycodestyle

pep8 is now pycodestyle

.travis/after_success.sh

@@ -16,19 +16,19 @@ coveralls-merge coverage.c.json
 codecov
 
 if [ "$DOCKER" == "" ]; then
-	pip install pep8 pyflakes
-	pep8 --statistics --count PIL/*.py
-	pep8 --statistics --count Tests/*.py
-	pyflakes *.py       | tee >(wc -l)
-	pyflakes PIL/*.py   | tee >(wc -l)
-	pyflakes Tests/*.py | tee >(wc -l)
+    pip install pyflakes pycodestyle
+    pyflakes *.py       | tee >(wc -l)
+    pyflakes PIL/*.py   | tee >(wc -l)
+    pyflakes Tests/*.py | tee >(wc -l)
+    pycodestyle --statistics --count PIL/*.py
+    pycodestyle --statistics --count Tests/*.py
 fi
 
 if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ] && [ "$DOCKER" == "" ]; then
-	# Coverage and quality reports on just the latest diff.
-	# (Installation is very slow on Py3, so just do it for Py2.)
-	depends/diffcover-install.sh
-	depends/diffcover-run.sh
+    # Coverage and quality reports on just the latest diff.
+    # (Installation is very slow on Py3, so just do it for Py2.)
+    depends/diffcover-install.sh
+    depends/diffcover-run.sh
 fi
 
 # after_all

requirements.txt

@@ -1,11 +1,7 @@
 # Development, documentation & testing requirements.
 -e .
-Babel
-Jinja2
-MarkupSafe
-Pygments
-Sphinx
 alabaster
+Babel
 check-manifest
 cov-core
 coverage
@@ -13,14 +9,18 @@ coveralls
 docopt
 docutils
 jarn.viewdoc
-nose-cov
+Jinja2
+MarkupSafe
 nose
+nose-cov
 olefile
-pep8
+pycodestyle
 pyflakes
+Pygments
 pyroma
 pytz
 requests
 six
 snowballstemmer
+Sphinx
 sphinx-rtd-theme