Merge branch '290-make-rewrite-metadata-respect-key-word-sort-order' into 'master'

[fdroidserver.git] / setup.py

diff --git a/setup.py b/setup.py
index 9c068b86654f327295f436a3d78eb4ad5151f3fe..c1705ed9d76f57ad0c10f5ef6f01f23a3057091b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,16 +1,17 @@
 #!/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.7.0',
       description='F-Droid Server Tools',
       long_description=open('README.md').read(),
       author='The F-Droid Project',
@@ -27,6 +28,7 @@ setup(name='fdroidserver',
                   'examples/fdroid-icon.png']),
       ],
       install_requires=[
+          'clint',
           'GitPython',
           'mwclient',
           'paramiko',
@@ -34,8 +36,11 @@ 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',