From 9f43e03b8b2f9d16156d51567799f9f07e17136a Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 1 Nov 2012 14:23:58 +0100 Subject: [PATCH] Updated openstack-common setup and version code. Updating setup and version require code changes in the code base. This is done here to support Id9c116a1e10e5c240913fae7a127110b806eff0f Change-Id: I60b6dd6d684982e33de8fbf051a3dcaf98cb9b87 --- openstack-common.conf | 2 +- setup.py | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/openstack-common.conf b/openstack-common.conf index 93c65eb90..01723f04b 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -1,5 +1,5 @@ [DEFAULT] # The list of modules to copy from openstack-common -modules=cfg,context,eventlet_backdoor,exception,excutils,gettextutils,importutils,iniparser,jsonutils,local,log,loopingcall,network_utils,notifier,policy,rpc,service,setup,threadgroup,timeutils,uuidutils +modules=cfg,context,eventlet_backdoor,exception,excutils,gettextutils,importutils,iniparser,jsonutils,local,log,loopingcall,network_utils,notifier,policy,rpc,service,setup,threadgroup,timeutils,uuidutils,version # The base module to hold the copy of openstack.common base=quantum diff --git a/setup.py b/setup.py index 3aa914355..7e410bfae 100644 --- a/setup.py +++ b/setup.py @@ -15,17 +15,14 @@ import setuptools from quantum.openstack.common import setup - -setup.write_vcsversion('quantum/vcsversion.py') - -from quantum import version +from quantum.version import version_info as version requires = setup.parse_requirements() depend_links = setup.parse_dependency_links() Name = 'quantum' Url = "https://launchpad.net/quantum" -Version = version.canonical_version_string() +Version = version.canonical_version_string(always=True) License = 'Apache License 2.0' Author = 'Netstack' AuthorEmail = 'netstack@lists.launchpad.net'