From a0b92e38c839edc5227c963a8f7af2145e9a2e28 Mon Sep 17 00:00:00 2001 From: Peter Bittner Date: Sun, 10 Apr 2016 20:05:49 +0200 Subject: [PATCH] Fix flake8 complaints Move flake8 configuration into tox config file --- setup.cfg | 4 ---- todo/settings.py | 1 - todo/views.py | 8 ++++---- tox.ini | 6 ++++++ 4 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index ed39ce3..0000000 --- a/setup.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[flake8] -max-line-length = 120 -max-complexity = 10 -exclude = build,dist,docs/conf.py,*/migrations,*.egg-info diff --git a/todo/settings.py b/todo/settings.py index 3c9099e..e9231b5 100644 --- a/todo/settings.py +++ b/todo/settings.py @@ -1,5 +1,4 @@ from django.conf import settings -from django.contrib.auth.models import User STAFF_ONLY = getattr(settings, 'TODO_STAFF_ONLY', False) diff --git a/todo/views.py b/todo/views.py index 4624735..27f83a3 100644 --- a/todo/views.py +++ b/todo/views.py @@ -389,7 +389,7 @@ def search(request): query_string = None found_items = None - return render(request, - 'todo/search_results.html', - {'query_string': query_string, 'found_items': found_items}, - context_instance=RequestContext(request)) + return render(request, 'todo/search_results.html', { + 'query_string': query_string, + 'found_items': found_items + }, context_instance=RequestContext(request)) diff --git a/tox.ini b/tox.ini index 9e7eeb5..a0d1671 100644 --- a/tox.ini +++ b/tox.ini @@ -16,3 +16,9 @@ commands = flake8 . basepython = python3.4 deps = flake8 commands = flake8 . + +[flake8] +# TODO: reduce max-complexity, ideally to 10 +max-line-length = 120 +max-complexity = 21 +exclude = build,dist,docs/conf.py,*/migrations,*.egg-info