Merge remote-tracking branch 'kali/feature/add_versioneer' into develop
authorTomás Touceda <chiiph@leap.se>
Fri, 23 Aug 2013 13:24:34 +0000 (10:24 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 23 Aug 2013 13:24:34 +0000 (10:24 -0300)
Conflicts:
setup.py

1  2 
setup.py

diff --cc setup.py
+++ b/setup.py
@@@ -19,9 -19,27 +19,15 @@@ setup file for leap.commo
  """
  from setuptools import setup, find_packages
  
 -# XXX parse pkg/requirements.pip
 -requirements = [
 -    "jsonschema",
 -    "pyxdg",
 -    'protobuf>=2.4.1',
 -    'protobuf.socketrpc',
 -    "PyOpenSSL",
 -    "python-dateutil",
 -    "PyCrypto",
 -]
 -
 -#dependency_links = [
 -    #"https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2.tar.gz#egg=protobuf.socketrpc"
 -#]
 -
 +from pkg import utils
 +parsed_reqs = utils.parse_requirements()
 +
+ 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-'
  tests_requirements = [
      'mock',
  ]