Merge branch 'develop'

revant · Jun 20, 2016 · def9f7b · def9f7b
2 parents 7c86bda + e87f600
commit def9f7b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/civil_contracting/__init__.py b/civil_contracting/__init__.py
@@ -0,0 +1,3 @@
+from __future__ import unicode_literals
+
+__version__ = '1.5.0'
diff --git a/civil_contracting/__version__.py b/civil_contracting/__version__.py
diff --git a/civil_contracting/hooks.py b/civil_contracting/hooks.py
@@ -1,11 +1,12 @@
+from . import __version__ as app_version
+
 app_name = "civil_contracting"
 app_title = "Civil Contracting"
 app_publisher = "Revant Nandgaonkar"
 app_description = "App for Civil Contracting Enterprises"
 app_icon = "octicon octicon-zap"
 app_color = "grey"
 app_email = "revant.one@gmail.com"
-app_version = "1.4.0"
 app_license = "GPL v2"
 
 # Includes in <head>

diff --git a/setup.py b/setup.py
@@ -1,7 +1,13 @@
 from setuptools import setup, find_packages
 import os
 
-version = '1.4.0'
+import re, ast
+
+# get version from __version__ variable in app's/__init__.py
+_version_re = re.compile(r'__version__\s+=\s+(.*)')
+with open('civil_contracting/__init__.py', 'rb') as f:
+	version = str(ast.literal_eval(_version_re.search(
+		f.read().decode('utf-8')).group(1)))
 
 setup(
     name='civil_contracting',