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

[fdroidserver.git] / setup.py

diff --git a/setup.py b/setup.py
index e8b2e1280bf2dd4116eae97b1175510c61a943be..15544732e01a20f1f29cc71093a4ca5cf09be4b4 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,7 @@
 
 from setuptools import setup
 import os
+import shutil
 import sys
 
 # workaround issue on OSX or --user installs, where sys.prefix is not an installable location
@@ -10,25 +11,38 @@ if os.access(sys.prefix, os.W_OK | os.X_OK):
 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:
+    print('Using Markdown README')
+    with open('README.md') as fp:
+        readme = fp.read()
+
 setup(name='fdroidserver',
-      version='0.7.0',
+      version='0.8',
       description='F-Droid Server Tools',
-      long_description=open('README.md').read(),
+      long_description=readme,
       author='The F-Droid Project',
       author_email='team@f-droid.org',
       url='https://f-droid.org',
+      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/fdroid-icon.png'
+               'examples/fdroid-icon.png',
                'examples/makebuildserver.config.py',
                'examples/opensc-fdroid.cfg',
                'examples/public-read-only-s3-bucket-policy.json',
                'examples/template.yml']),
       ],
+      python_requires='>=3.4',
       install_requires=[
           'clint',
           'GitPython',
@@ -41,8 +55,8 @@ setup(name='fdroidserver',
           'python-vagrant',
           'PyYAML',
           'ruamel.yaml >= 0.13',
-          'requests < 2.11',
-          'docker-py == 1.9.0',
+          'requests >= 2.5.2, != 2.11.0, != 2.12.2, != 2.18.0',
+          'docker-py >= 1.9, < 2.0',
       ],
       classifiers=[
           'Development Status :: 4 - Beta',