From 825a6221356005de889a43304868c1db450dac47 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 9 Jun 2016 16:07:09 +0530 Subject: [PATCH] [fix] change in versioning: store __version__ in __init__.py --- frappe/__init__.py | 2 +- frappe/__version__.py | 2 -- frappe/hooks.py | 4 ++-- frappe/utils/boilerplate.py | 21 ++++++++++++++++++--- setup.py | 9 ++++++++- 5 files changed, 29 insertions(+), 9 deletions(-) delete mode 100644 frappe/__version__.py diff --git a/frappe/__init__.py b/frappe/__init__.py index 8f56d0d90f..71788796aa 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -11,10 +11,10 @@ from functools import wraps import os, importlib, inspect, logging, json # public -from frappe.__version__ import __version__ from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template +__version__ = "6.27.21" local = Local() diff --git a/frappe/__version__.py b/frappe/__version__.py deleted file mode 100644 index 0fb7878698..0000000000 --- a/frappe/__version__.py +++ /dev/null @@ -1,2 +0,0 @@ -from __future__ import unicode_literals -__version__ = "6.27.21" diff --git a/frappe/hooks.py b/frappe/hooks.py index dfb0685e1c..b5234ee349 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -1,11 +1,11 @@ from __future__ import unicode_literals +from . import __version__ as app_version + app_name = "frappe" app_title = "Frappe Framework" app_publisher = "Frappe Technologies" app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node" - app_icon = "octicon octicon-circuit-board" -app_version = "6.27.21" app_color = "orange" source_link = "https://github.com/frappe/frappe" app_license = "MIT" diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py index 1a175ce59c..022fcb575e 100644 --- a/frappe/utils/boilerplate.py +++ b/frappe/utils/boilerplate.py @@ -53,7 +53,8 @@ def make_boilerplate(dest, app_name): "includes")) frappe.create_folder(os.path.join(dest, hooks.app_name, hooks.app_name, "config"), with_init=True) - touch_file(os.path.join(dest, hooks.app_name, hooks.app_name, "__init__.py")) + with open(os.path.join(dest, hooks.app_name, hooks.app_name, "__init__.py"), "w") as f: + f.write(encode(init_template)) with open(os.path.join(dest, hooks.app_name, "MANIFEST.in"), "w") as f: f.write(encode(manifest_template.format(**hooks))) @@ -110,8 +111,16 @@ recursive-include {app_name} *.svg recursive-include {app_name} *.txt recursive-exclude {app_name} *.pyc""" +init_template = """# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +__version__ = '0.0.1' + +""" + hooks_template = """# -*- coding: utf-8 -*- from __future__ import unicode_literals +from . import __version__ as app_version app_name = "{app_name}" app_title = "{app_title}" @@ -120,7 +129,6 @@ app_description = "{app_description}" app_icon = "{app_icon}" app_color = "{app_color}" app_email = "{app_email}" -app_version = "0.0.1" app_license = "{app_license}" # Includes in @@ -244,8 +252,15 @@ def get_data(): setup_template = """# -*- coding: utf-8 -*- from setuptools import setup, find_packages from pip.req import parse_requirements +import re, ast + +# get version from __version__ variable in {app_name}/__init__.py +_version_re = re.compile(r'__version__\s+=\s+(.*)') + +with open('{app_name}/__init__.py', 'rb') as f: + version = str(ast.literal_eval(_version_re.search( + f.read().decode('utf-8')).group(1))) -version = '0.0.1' requirements = parse_requirements("requirements.txt", session="") setup( diff --git a/setup.py b/setup.py index afe470c8ed..bbcf6cfb37 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,14 @@ from setuptools import setup, find_packages from pip.req import parse_requirements +import re, ast + +# get version from __version__ variable in frappe/__init__.py +_version_re = re.compile(r'__version__\s+=\s+(.*)') + +with open('frappe/__init__.py', 'rb') as f: + version = str(ast.literal_eval(_version_re.search( + f.read().decode('utf-8')).group(1))) -version = "6.27.21" requirements = parse_requirements("requirements.txt", session="") setup(