Merge branch 'bsd-osx-porting-and-tests' into 'master'

[fdroidserver.git] / setup.py

diff --git a/setup.py b/setup.py
index a4bff8c84298267e1589496c3706a639766ac8b8..12cf73d3be41c228cfc7d871df5ae59756a7b40b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,8 +3,14 @@
 from setuptools import setup
 import sys
 
+# workaround issue with easy_install 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'
+else:
+    data_prefix = sys.prefix
+
 setup(name='fdroidserver',
-      version='0.2.1',
+      version='0.3.0',
       description='F-Droid Server Tools',
       long_description=open('README').read(),
       author='The F-Droid Project',
@@ -13,21 +19,21 @@ setup(name='fdroidserver',
       packages=['fdroidserver'],
       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/opensc-fdroid.cfg',
                   'examples/fdroid-icon.png']),
       ],
-      install_requires=[
+      install_requires=[  # should include 'python-magic' but its not strictly required
           'mwclient',
           'paramiko',
           'Pillow',
-          'python-magic',
           'apache-libcloud >= 0.14.1',
           'pyasn1',
           'pyasn1-modules',
+          'requests',
       ],
       classifiers=[
           'Development Status :: 3 - Alpha',