Use snf-common version util to update version.py

diff --git a/.gitignore b/.gitignore
index 0da470a..bc0634c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ include/
 *.egg-info
 dist
 _build
+cloudcms/version.py

diff --git a/cloudcms/version.py b/cloudcms/version.py
deleted file mode 100644 (file)
index 2c55077..0000000
--- a/cloudcms/version.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2012 GRNET S.A. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or
-# without modification, are permitted provided that the following
-# conditions are met:
-#
-#   1. Redistributions of source code must retain the above
-#      copyright notice, this list of conditions and the following
-#      disclaimer.
-#
-#   2. Redistributions in binary form must reproduce the above
-#      copyright notice, this list of conditions and the following
-#      disclaimer in the documentation and/or other materials
-#      provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# The views and conclusions contained in the software and
-# documentation are those of the authors and should not be
-# interpreted as representing official policies, either expressed
-# or implied, of GRNET S.A.
-
-
-__version__ = '0.1'

diff --git a/setup.py b/setup.py
index cf77f2a..9f67e25 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -39,6 +39,20 @@ from fnmatch import fnmatchcase
 from distutils.util import convert_path
 from setuptools import setup, find_packages
 
+HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
+try:
+    # try to update the version file
+    from synnefo.util import version
+    version.update_version('cloudcms', 'version', HERE)
+except ImportError:
+    pass
+
+from cloudcms.version import __version__
+
+# Package info
+VERSION = __version__
+
+
 INSTALL_REQUIRES = [
     'snf-common>=0.9.0rc',
     'Django >=1.2.3, <1.3',
@@ -132,9 +146,6 @@ def find_package_data(
                 out.setdefault(package, []).append(prefix+name)
     return out
 
-from cloudcms import version
-VERSION = version.__version__
-
 setup(
     name = 'snf-cloudcms',
     version = VERSION,