diff options
author | Kali Kaneko <kali@leap.se> | 2016-04-25 21:08:11 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2016-04-25 21:08:11 -0400 |
commit | f660630ac6676dd31d4984f4df9e9110b548b746 (patch) | |
tree | 9f2be4650d852ea16b2fd3bfd108e5c376bfacbb /client/setup.py | |
parent | 40e32be29d9b02e03da4f007fb4f68f3e3709c01 (diff) | |
parent | d5974f61df6ca640dde69903976d4721b6d88007 (diff) |
Merge tag '0.8.0' into debian/experimental
Tag soledad version 0.8.0
Diffstat (limited to 'client/setup.py')
-rw-r--r-- | client/setup.py | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/client/setup.py b/client/setup.py index dc555641..4480e247 100644 --- a/client/setup.py +++ b/client/setup.py @@ -21,15 +21,10 @@ import re from setuptools import setup from setuptools import find_packages from setuptools import Command +import versioneer from pkg import utils -import versioneer -versioneer.versionfile_source = 'src/leap/soledad/client/_version.py' -versioneer.versionfile_build = 'leap/soledad/client/_version.py' -versioneer.tag_prefix = '' # tags are like 1.2.0 -versioneer.parentdir_prefix = 'leap.soledad.client-' - trove_classifiers = ( "Development Status :: 3 - Alpha", @@ -45,11 +40,11 @@ trove_classifiers = ( "Topic :: Software Development :: Libraries :: Python Modules" ) -DOWNLOAD_BASE = ('https://github.com/leapcode/soledad/' +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 @@ -58,15 +53,30 @@ if len(_version_short) > 0: VERSION_SHORT = _version_short[0] DOWNLOAD_URL = DOWNLOAD_BASE % VERSION_SHORT -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,28 +90,15 @@ 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) +cmdclass = versioneer.get_cmdclass() cmdclass["freeze_debianver"] = freeze_debianver |