Update flake8 configuration

3 files changed, 8 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 79dfaa0..20f7e32 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ test: bootstrap lint
 
 lint:
 	@echo "Linting Python files"
-	flake8 --exclude=migrations --ignore=E501,E225,E121,E123,E124,E125,E127,E128 raven || exit 1
+	PYFLAKES_NODOCTEST=1 flake8 raven || exit 1
 	@echo ""
 
 coverage:
diff --git a/raven/contrib/django/serializers.py b/raven/contrib/django/serializers.py
index b0e1e0f..b0c31ad 100644
--- a/raven/contrib/django/serializers.py
+++ b/raven/contrib/django/serializers.py
@@ -26,8 +26,8 @@ class PromiseSerializer(Serializer):
 
         pre = value.__class__.__name__[1:]
         if not (hasattr(value, '%s__func' % pre) or
-            hasattr(value, '%s__unicode_cast' % pre) or
-            hasattr(value, '%s__text_cast' % pre)):
+                hasattr(value, '%s__unicode_cast' % pre) or
+                hasattr(value, '%s__text_cast' % pre)):
             return False
 
         return True
diff --git a/setup.cfg b/setup.cfg
index 7c1bf61..bf07533 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,8 @@
 [pytest]
 python_files=test*.py
 addopts=--tb=short
+
+[flake8]
+ignore = F999,E501,E128,E124
+max-line-length = 100
+exclude = .tox,.git,docs