add missing comma in setup.py

[fdroidserver.git] / setup.py

diff --git a/setup.py b/setup.py
index 9c068b86654f327295f436a3d78eb4ad5151f3fe..12e2476b00ac2448c1d510a1e96465796706cb55 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,32 +1,36 @@
 #!/usr/bin/env python3
 
 from setuptools import setup
+import os
 import sys
 
-# workaround issue on OSX, where sys.prefix is not an installable location
-if sys.platform == 'darwin' and sys.prefix.startswith('/System'):
-    data_prefix = '.'
-else:
+# 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.6.0',
+      version='0.8',
       description='F-Droid Server Tools',
       long_description=open('README.md').read(),
       author='The F-Droid Project',
       author_email='team@f-droid.org',
       url='https://f-droid.org',
       packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'],
-      scripts=['fdroid', 'fd-commit'],
+      scripts=['fdroid', 'fd-commit', 'makebuildserver'],
       data_files=[
           (data_prefix + '/share/doc/fdroidserver/examples',
               ['buildserver/config.buildserver.py',
-                  'examples/config.py',
-                  'examples/makebuildserver.config.py',
-                  'examples/opensc-fdroid.cfg',
-                  'examples/fdroid-icon.png']),
+               '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=[
+          'clint',
           'GitPython',
           'mwclient',
           'paramiko',
@@ -34,14 +38,22 @@ setup(name='fdroidserver',
           'apache-libcloud >= 0.14.1',
           'pyasn1',
           'pyasn1-modules',
+          'python-vagrant',
           'PyYAML',
-          'requests',
+          'ruamel.yaml >= 0.13',
+          'requests < 2.11',
+          'docker-py == 1.9.0',
       ],
       classifiers=[
-          'Development Status :: 3 - Alpha',
+          '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',
       ],
       )