add missing comma in setup.py

[fdroidserver.git] / setup.py

diff --git a/setup.py b/setup.py
index d4566f07a14edfb3375b0f6b2db7039e08c5aba5..12e2476b00ac2448c1d510a1e96465796706cb55 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,44 +1,59 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 from setuptools import setup
 import os
-import subprocess
 import sys
 
-if not os.path.exists('fdroidserver/getsig/getsig.class'):
-    subprocess.check_output('cd fdroidserver/getsig && javac getsig.java',
-                            shell=True)
+# workaround issue on OSX or --user installs, where sys.prefix is not an installable location
+if os.access(sys.prefix, os.W_OK | os.X_OK):
+    data_prefix = sys.prefix
+else:
+    data_prefix = '.'
 
 setup(name='fdroidserver',
-      version='0.2',
+      version='0.8',
       description='F-Droid Server Tools',
-      long_description=open('README').read(),
+      long_description=open('README.md').read(),
       author='The F-Droid Project',
       author_email='team@f-droid.org',
       url='https://f-droid.org',
-      packages=['fdroidserver'],
-      scripts=['fdroid', 'fd-commit'],
+      packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'],
+      scripts=['fdroid', 'fd-commit', 'makebuildserver'],
       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'])
-        ],
+          (data_prefix + '/share/doc/fdroidserver/examples',
+              ['buildserver/config.buildserver.py',
+               'examples/config.py',
+               'examples/fdroid-icon.png',
+               'examples/makebuildserver.config.py',
+               'examples/opensc-fdroid.cfg',
+               'examples/public-read-only-s3-bucket-policy.json',
+               'examples/template.yml']),
+      ],
       install_requires=[
-        'mwclient',
-        'paramiko',
-        'PIL',
-        'python-magic',
-        'apache-libcloud >= 0.14.1',
-        ],
+          'clint',
+          'GitPython',
+          'mwclient',
+          'paramiko',
+          'Pillow',
+          'apache-libcloud >= 0.14.1',
+          'pyasn1',
+          'pyasn1-modules',
+          'python-vagrant',
+          'PyYAML',
+          'ruamel.yaml >= 0.13',
+          'requests < 2.11',
+          'docker-py == 1.9.0',
+      ],
       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 :: 4 - Beta',
+          'Intended Audience :: Developers',
+          'Intended Audience :: Information Technology',
+          'Intended Audience :: System Administrators',
+          'Intended Audience :: Telecommunications Industry',
+          'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
+          'Operating System :: POSIX',
+          'Operating System :: MacOS :: MacOS X',
+          'Operating System :: Unix',
+          'Topic :: Utilities',
+      ],
       )