From f8995a9b32f9f904bd1454edc3d15d6c49fdb04d Mon Sep 17 00:00:00 2001 From: Diogo Baeder Date: Sun, 24 Feb 2013 21:18:39 -0300 Subject: [PATCH 1/2] Removing setuptools from setup requirements --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 3c774da..e189283 100644 --- a/setup.py +++ b/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", From 7635b0048cf89ec587c70b0881d5483242d63c96 Mon Sep 17 00:00:00 2001 From: Diogo Baeder Date: Sun, 24 Feb 2013 21:23:10 -0300 Subject: [PATCH 2/2] Removing trailing spaces (otherwise flake8 doesn't pass flake8 :-) --- flake8/hooks.py | 2 +- flake8/main.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake8/hooks.py b/flake8/hooks.py index bd6ba33..4d5eb3b 100644 --- a/flake8/hooks.py +++ b/flake8/hooks.py @@ -14,7 +14,7 @@ from flake8.main import DEFAULT_CONFIG def git_hook(complexity=-1, strict=False, ignore=None, lazy=False): """This is the function used by the git hook. - + :param int complexity: (optional), any value > 0 enables complexity checking with mccabe :param bool strict: (optional), if True, this returns the total number of diff --git a/flake8/main.py b/flake8/main.py index 692e9f4..8054f21 100644 --- a/flake8/main.py +++ b/flake8/main.py @@ -42,7 +42,7 @@ def main(): def check_file(path, ignore=(), complexity=-1): - """Checks a file using pep8 and pyflakes by default and mccabe + """Checks a file using pep8 and pyflakes by default and mccabe optionally. :param str path: path to the file to be checked