3 files changed, 14 insertions, 6 deletions
diff --git a/pep8 b/pep8
deleted file mode 100755
index d0da40e..0000000
--- a/pep8
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-pep8 src/leap/mail
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..51070c6
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,10 @@
+[aliases]
+test = trial
+
+[pep8]
+exclude = versioneer.py,_version.py,*.egg,build,docs
+ignore = E731
+
+[flake8]
+exclude = versioneer.py,_version.py,*.egg,build,docs
+ignore = E731
diff --git a/setup.py b/setup.py
index ead8982..575a6ec 100644
--- a/setup.py
+++ b/setup.py
@@ -20,6 +20,10 @@ Setup file for leap.mail
 import re
 from setuptools import setup
 from setuptools import find_packages
+from setuptools import Command
+
+from pkg import utils
+
 
 import versioneer
 versioneer.versionfile_source = 'src/leap/mail/_version.py'
@@ -27,7 +31,6 @@ versioneer.versionfile_build = 'leap/mail/_version.py'
 versioneer.tag_prefix = ''  # tags are like 1.2.0
 versioneer.parentdir_prefix = 'leap.mail-'
 
-from pkg import utils
 
 trove_classifiers = [
     'Development Status :: 4 - Beta',
@@ -63,9 +66,6 @@ if len(_version_short) > 0:
 cmdclass = versioneer.get_cmdclass()
 
 
-from setuptools import Command
-
-
 class freeze_debianver(Command):
     """
     Freezes the version in a debian branch.