Merge branch 'fix-makebuildserver' into 'master'

[fdroidserver.git] / setup.py

diff --git a/setup.py b/setup.py
index 12cf73d3be41c228cfc7d871df5ae59756a7b40b..da4fdba5d0411713f7b25644948e43ec4089a373 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,44 +1,47 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 from setuptools import setup
 import sys
 
-# workaround issue with easy_install on OSX, where sys.prefix is not an installable location
+# workaround issue on OSX, where sys.prefix is not an installable location
 if sys.platform == 'darwin' and sys.prefix.startswith('/System'):
-    data_prefix = '/Library/Python/2.7/site-packages'
+    data_prefix = '.'
 else:
     data_prefix = sys.prefix
 
 setup(name='fdroidserver',
-      version='0.3.0',
+      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=[
           (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=[  # should include 'python-magic' but its not strictly required
+      install_requires=[
+          'clint',
+          'GitPython',
           'mwclient',
           'paramiko',
           'Pillow',
           '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',
       ],