Merge branch 'support-xml-json-yaml-for-metadata' into 'master'

[fdroidserver.git] / setup.py

diff --git a/setup.py b/setup.py
index 3518d869f3eac1a1c06fbc8abb7c108200f0f1a8..a98fe264972a799687569285d6c293024022b826 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,16 +3,16 @@
 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.4.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',
@@ -26,14 +26,14 @@ setup(name='fdroidserver',
                   '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',
+          'PyYAML',
           'requests',
       ],
       classifiers=[