Merge branch 'develop'

mntechnique · Jun 20, 2016 · 0ab86c4 · 0ab86c4
2 parents 4e78217 + 7fe37e2
commit 0ab86c4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/kiratplastics_erpnext/__init__.py b/kiratplastics_erpnext/__init__.py
@@ -0,0 +1 @@
+__version__ = '1.2.0'
diff --git a/kiratplastics_erpnext/__version__.py b/kiratplastics_erpnext/__version__.py
diff --git a/kiratplastics_erpnext/hooks.py b/kiratplastics_erpnext/hooks.py
@@ -1,14 +1,16 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+from . import __version__ as app_version
+
+
 app_name = "kiratplastics_erpnext"
 app_title = "Kirat Plastics ERPNext"
 app_publisher = "MN Technique"
 app_description = "ERPNext extensions for Kirat Plastics Pvt. Ltd."
 app_icon = "octicon octicon-file-directory"
 app_color = "grey"
 app_email = "[email protected]"
-app_version = "1.1.2"
 app_license = "GPL v3"
 
 # Includes in <head>

diff --git a/setup.py b/setup.py
@@ -1,8 +1,15 @@
 # -*- coding: utf-8 -*-
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
+import re, ast
+
+ # get version from __version__ variable in erpnext/__init__.py
+ _version_re = re.compile(r'__version__\s+=\s+(.*)')
+
+ with open('kiratplastics_erpnext/__init__.py', 'rb') as f:
+     version = str(ast.literal_eval(_version_re.search(
+         f.read().decode('utf-8')).group(1)))
 
-version = '1.1.2'
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(