Merge branch 'master' into 'master'

[fdroidserver.git] / setup.py

diff --git a/setup.py b/setup.py
index 5e7e9a34c11cf2ae712445ae79a43f9467b1672e..f50c4d86bb253b723f53e9f1bfd2267139c73e26 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+from setuptools import Command
 from setuptools import setup
 import os
 import re
@@ -7,6 +8,26 @@ import shutil
 import sys
 
 
+class VersionCheckCommand(Command):
+    """Make sure git tag and version match before uploading"""
+    user_options = []
+
+    def initialize_options(self):
+        """Abstract method that is required to be overwritten"""
+
+    def finalize_options(self):
+        """Abstract method that is required to be overwritten"""
+
+    def run(self):
+        version = self.distribution.get_version()
+        version_git = subprocess.check_output(['git', 'describe', '--tags', '--always']).rstrip().decode('utf-8')
+        if version != version_git:
+            print('ERROR: Release version mismatch! setup.py (%s) does not match git (%s)'
+                  % (version, version_git))
+            sys.exit(1)
+        print('Upload using: twine upload dist/fdroidserver*.tar.gz*')
+
+
 def get_data_files():
     # 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):
@@ -45,7 +66,7 @@ else:
     readme = ''
 
 setup(name='fdroidserver',
-      version='1.0.dev0',
+      version='1.0.3',
       description='F-Droid Server Tools',
       long_description=readme,
       author='The F-Droid Project',
@@ -53,9 +74,13 @@ setup(name='fdroidserver',
       url='https://f-droid.org',
       license='AGPL-3.0',
       packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'],
-      scripts=['fdroid', 'fd-commit', 'makebuildserver'],
+      scripts=['fdroid', 'makebuildserver'],
       data_files=get_data_files(),
       python_requires='>=3.4',
+      cmdclass={'versioncheck': VersionCheckCommand},
+      setup_requires=[
+          'babel',
+      ],
       install_requires=[
           'clint',
           'GitPython',
@@ -67,6 +92,7 @@ setup(name='fdroidserver',
           'pyasn1-modules',
           'python-vagrant',
           'PyYAML',
+          'qrcode',
           'ruamel.yaml >= 0.13',
           'requests >= 2.5.2, != 2.11.0, != 2.12.2, != 2.18.0',
           'docker-py >= 1.9, < 2.0',