Merge branch 'maintenance-0.5' into maintenance-0.6

[changelog skip]

Author: dahlia

setup.py

@@ -40,7 +40,7 @@ def get_version():
 ] + service_requires
 tests_require = [
     'pytest >= 3.1.2, < 4.0.0',
-    'pytest-flake8 >= 0.8.1, < 1.0.0',
+    'pytest-flake8 >= 0.9.1, < 1.0.0',
     'flake8-import-order >= 0.12, < 1.0',
     'flake8-import-order-spoqa >= 1.0.1, < 2.0.0',
 ]

tox.ini

@@ -3,10 +3,6 @@ envlist = buildfixture,{py27,py34,py35,py36}-{typing351,typing352},docs
 
 [testenv]
 deps =
-    ; FIXME: the following command should be removed when
-    ; https://github.com/tholo/pytest-flake8/pull/35 is merged:
-    git+git://github.com/jezdez/[email protected]
-
     -e.[tests]
     typing351: typing<3.5.2
     typing352: typing>=3.5.2