Merge branch 'build-drozer-syntax-error' into 'master'

[fdroidserver.git] / setup.py

diff --git a/setup.py b/setup.py
index 043d899eed1bfcd001d016e6d3a6b2753f128a34..15544732e01a20f1f29cc71093a4ca5cf09be4b4 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,45 +1,73 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 from setuptools import setup
+import os
+import shutil
 import sys
 
-# workaround issue on OSX, where sys.prefix is not an installable location
-if sys.platform == 'darwin' and sys.prefix.startswith('/System'):
+# 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 = '.'
+
+# PyPI accepts reST not Markdown
+if shutil.which('pandoc'):
+    print('Using reST README')
+    import subprocess
+    readme = subprocess.check_output(['pandoc', '--from=markdown', '--to=rst', 'README.md'],
+                                     universal_newlines=True)
 else:
-    data_prefix = sys.prefix
+    print('Using Markdown README')
+    with open('README.md') as fp:
+        readme = fp.read()
 
 setup(name='fdroidserver',
-      version='0.3.0',
+      version='0.8',
       description='F-Droid Server Tools',
-      long_description=open('README').read(),
+      long_description=readme,
       author='The F-Droid Project',
       author_email='team@f-droid.org',
       url='https://f-droid.org',
-      packages=['fdroidserver'],
-      scripts=['fdroid', 'fd-commit'],
+      license='AGPL-3.0',
+      packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'],
+      scripts=['fdroid', 'fd-commit', 'makebuildserver'],
       data_files=[
           (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']),
+               'examples/config.py',
+               'examples/fdroid-icon.png',
+               'examples/makebuildserver.config.py',
+               'examples/opensc-fdroid.cfg',
+               'examples/public-read-only-s3-bucket-policy.json',
+               'examples/template.yml']),
       ],
-      install_requires=[  # should include 'python-magic' but its not strictly required
+      python_requires='>=3.4',
+      install_requires=[
+          'clint',
+          'GitPython',
           'mwclient',
           'paramiko',
           'Pillow',
           'apache-libcloud >= 0.14.1',
           'pyasn1',
           'pyasn1-modules',
-          'requests',
+          'python-vagrant',
+          'PyYAML',
+          'ruamel.yaml >= 0.13',
+          'requests >= 2.5.2, != 2.11.0, != 2.12.2, != 2.18.0',
+          'docker-py >= 1.9, < 2.0',
       ],
       classifiers=[
-          'Development Status :: 3 - Alpha',
+          'Development Status :: 4 - Beta',
           'Intended Audience :: Developers',
-          'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
+          'Intended Audience :: Information Technology',
+          'Intended Audience :: System Administrators',
+          'Intended Audience :: Telecommunications Industry',
+          'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
           'Operating System :: POSIX',
+          'Operating System :: MacOS :: MacOS X',
+          'Operating System :: Unix',
           'Topic :: Utilities',
       ],
       )