Merge branch 'p2' into 'master'

[fdroidserver.git] / setup.py

diff --git a/setup.py b/setup.py
index 669cfaee60174696d59d2485f29cb4ab9aa7810d..947112f9a4e961af407bb4ffdc2e1b12660824ea 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,37 +3,44 @@
 from setuptools import setup
 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:
+    data_prefix = sys.prefix
+
 setup(name='fdroidserver',
-      version='0.2.1',
+      version='0.6.0',
       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'],
+      packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'],
       scripts=['fdroid', 'fd-commit'],
       data_files=[
-          (sys.prefix + '/share/doc/fdroidserver/examples',
+          (data_prefix + '/share/doc/fdroidserver/examples',
               ['buildserver/config.buildserver.py',
                   'examples/config.py',
-                  'examples/makebs.config.py',
+                  'examples/makebuildserver.config.py',
                   'examples/opensc-fdroid.cfg',
                   'examples/fdroid-icon.png']),
-          ],
+      ],
       install_requires=[
           'mwclient',
           'paramiko',
           'Pillow',
-          'python-magic',
           'apache-libcloud >= 0.14.1',
           'pyasn1',
           'pyasn1-modules',
-          ],
+          'PyYAML',
+          'requests',
+      ],
       classifiers=[
           'Development Status :: 3 - Alpha',
           'Intended Audience :: Developers',
-          'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
+          'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
           'Operating System :: POSIX',
           'Topic :: Utilities',
-          ],
+      ],
       )