summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-04-01 17:33:26 -0400
committerKali Kaneko <kali@leap.se>2016-04-01 17:33:26 -0400
commit334fe8d2d38466ad309e1214d003f977f603dfb9 (patch)
tree0ba143d184a93315408c9338cf600bbf3f299e45 /setup.py
parent9365e03b6490e0b86ddde0fe35854431bf17d94c (diff)
[pkg] update to versioneer 0.16
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py61
1 files changed, 31 insertions, 30 deletions
diff --git a/setup.py b/setup.py
index 1e77828..0d4c281 100644
--- a/setup.py
+++ b/setup.py
@@ -20,19 +20,16 @@ setup file for leap.common
import re
from setuptools import setup, find_packages
from setuptools import Command
+import versioneer
from pkg import utils
-import versioneer
-versioneer.versionfile_source = 'src/leap/common/_version.py'
-versioneer.versionfile_build = 'leap/common/_version.py'
-versioneer.tag_prefix = '' # tags are like 1.2.0
-versioneer.parentdir_prefix = 'leap.common-'
requirements = utils.parse_requirements()
-
-dependency_links = [requirement for requirement in requirements if requirement.startswith('http')]
-requirements = [requirement for requirement in requirements if requirement not in dependency_links]
+dependency_links = [requirement for requirement
+ in requirements if requirement.startswith('http')]
+requirements = [requirement for requirement
+ in requirements if requirement not in dependency_links]
requirements.append('dirspec')
tests_requirements = [
@@ -53,11 +50,11 @@ trove_classifiers = [
"Topic :: Utilities"
]
-DOWNLOAD_BASE = ('https://github.com/leapcode/leap_pycommon/'
+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
@@ -66,15 +63,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
@@ -88,34 +100,23 @@ 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)
+
try:
long_description = open('README.rst').read() + '\n\n\n' + \
open('CHANGELOG').read()
except Exception:
long_description = ""
+cmdclass = versioneer.get_cmdclass()
cmdclass["freeze_debianver"] = freeze_debianver
+
setup(
name='leap.common',
version=VERSION,