Fix the develop branch as well.

flake8/main.py

@@ -42,7 +42,8 @@ def main():
 
 
 def check_file(path, ignore=(), complexity=-1):
-    """Checks a file using pep8 and pyflakes by default and mccabe optionally.
+    """Checks a file using pep8 and pyflakes by default and mccabe
+    optionally.
 
     :param str path: path to the file to be checked
     :param tuple ignore: (optional), error and warning codes to be ignored

setup.py

@@ -31,7 +31,6 @@ setup(
     url="http://bitbucket.org/tarek/flake8",
     packages=["flake8", "flake8.tests"],
     install_requires=[
-        "setuptools",
         "pyflakes >= 0.6.1",
         "pep8 >= 1.4.3",
         "mccabe >= 0.2",