Merge branch 'index-parsing' into 'master'

[fdroidserver.git] / setup.py

diff --git a/setup.py b/setup.py
index 7b323f4b891951049590dc1921b9792cf093241f..ab74c94610289424bb016dde4dfb91eb7d2533fe 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,44 +1,49 @@
-#!/usr/bin/env python2
+#!/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.4.0',
+      version='0.7.0',
       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'],
+      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',
-          'requests',
+          'PyYAML',
+          '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+)',
+          'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
           'Operating System :: POSIX',
           'Topic :: Utilities',
       ],