Merge branch 'develop' into debian/platform-0.8

1 files changed, 24 insertions, 24 deletions

diff --git a/setup.py b/setup.py
index ec20ee2..7523222 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,7 @@ from setuptools import Command
 from pkg.utils.reqs import parse_requirements, is_develop_mode
 
 import versioneer
-versioneer.versionfile_source = 'src/leap/mx/_version.py'
-versioneer.versionfile_build = 'leap/mx/_version.py'
-versioneer.tag_prefix = ''  # tags are like 1.2.0
-versioneer.parentdir_prefix = 'leap.mx-'
+
 
 trove_classifiers = [
     'Development Status :: 3 - Alpha',
@@ -45,11 +42,11 @@ trove_classifiers = [
     'Topic :: Security :: Cryptography',
 ]
 
-DOWNLOAD_BASE = ('https://github.com/leapcode/leap_mx/'
+DOWNLOAD_BASE = ('https://github.com/leapcode/bitmask_client/'
                  'archive/%s.tar.gz')
 _versions = versioneer.get_versions()
 VERSION = _versions['version']
-VERSION_FULL = _versions['full']
+VERSION_REVISION = _versions['full-revisionid']
 DOWNLOAD_URL = ""
 
 # get the short version for the download url
@@ -62,11 +59,28 @@ cmdclass = versioneer.get_cmdclass()
 
 
 class freeze_debianver(Command):
+
     """
     Freezes the version in a debian branch.
     To be used after merging the development branch onto the debian one.
     """
     user_options = []
+    template = r"""
+# This file was generated by the `freeze_debianver` command in setup.py
+# Using 'versioneer.py' (0.16) from
+# revision-control system data, or from the parent directory name of an
+# unpacked source archive. Distribution tarballs contain a pre-generated copy
+# of this file.
+
+version_version = '{version}'
+full_revisionid = '{full_revisionid}'
+"""
+    templatefun = r"""
+
+def get_versions(default={}, verbose=False):
+        return {'version': version_version,
+                'full-revisionid': full_revisionid}
+"""
 
     def initialize_options(self):
         pass
@@ -80,25 +94,11 @@ class freeze_debianver(Command):
         if proceed != "y":
             print("He. You scared. Aborting.")
             return
-        template = r"""
-# This file was generated by the `freeze_debianver` command in setup.py
-# Using 'versioneer.py' (0.7+) from
-# revision-control system data, or from the parent directory name of an
-# unpacked source archive. Distribution tarballs contain a pre-generated copy
-# of this file.
-
-version_version = '{version}'
-version_full = '{version_full}'
-"""
-        templatefun = r"""
-
-def get_versions(default={}, verbose=False):
-        return {'version': version_version, 'full': version_full}
-"""
-        subst_template = template.format(
+        subst_template = self.template.format(
             version=VERSION_SHORT,
-            version_full=VERSION_FULL) + templatefun
-        with open(versioneer.versionfile_source, 'w') as f:
+            full_revisionid=VERSION_REVISION) + self.templatefun
+        versioneer_cfg = versioneer.get_config_from_root('.')
+        with open(versioneer_cfg.versionfile_source, 'w') as f:
             f.write(subst_template)