Add setup.py to pep8+pyflakes hook, fix it

diff --git a/hooks/pre-commit b/hooks/pre-commit
index 5a0cf541baae9dcb7d8c7df5efc632f434cdbec7..f46dac4fdf086eb5abf24c8cf15a5ffd30f200a6 100755 (executable)
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -6,7 +6,7 @@
 # Redirect output to stderr.
 exec 1>&2
 
-FILES="fdroid makebuildserver examples/*.py buildserver/*.py fdroidserver/*.py"
+FILES="fdroid makebuildserver setup.py examples/*.py buildserver/*.py fdroidserver/*.py"
 
 cmd_exists() {
        command -v $1 1>/dev/null

diff --git a/setup.py b/setup.py
index 356569a61a2f685435a456969da609f830b2f019..82936c398a1c3c899369e295fa0257bb8c28aadd 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -19,26 +19,27 @@ setup(name='fdroidserver',
       packages=['fdroidserver'],
       scripts=['fdroid', 'fd-commit'],
       data_files=[
-        (sys.prefix + '/share/doc/fdroidserver/examples',
-         ['buildserver/config.buildserver.py',
-           'examples/config.py',
-           'examples/makebs.config.py',
-           'examples/opensc-fdroid.cfg',
-           'examples/fdroid-icon.png']),
-        ('fdroidserver/getsig', ['fdroidserver/getsig/getsig.class'])
-        ],
+          (sys.prefix + '/share/doc/fdroidserver/examples',
+              ['buildserver/config.buildserver.py',
+                  'examples/config.py',
+                  'examples/makebs.config.py',
+                  'examples/opensc-fdroid.cfg',
+                  'examples/fdroid-icon.png']),
+          ('fdroidserver/getsig',
+              ['fdroidserver/getsig/getsig.class']),
+          ],
       install_requires=[
-        'mwclient',
-        'paramiko',
-        'Pillow',
-        'python-magic',
-        'apache-libcloud >= 0.14.1',
-        ],
+          'mwclient',
+          'paramiko',
+          'Pillow',
+          'python-magic',
+          'apache-libcloud >= 0.14.1',
+          ],
       classifiers=[
-        'Development Status :: 3 - Alpha',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
-        'Operating System :: POSIX',
-        'Topic :: Utilities',
-        ],
+          'Development Status :: 3 - Alpha',
+          'Intended Audience :: Developers',
+          'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
+          'Operating System :: POSIX',
+          'Topic :: Utilities',
+          ],
       )