From 5590193c8d82fb1f72bbd1afa1218c9281759fe2 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 7 Jan 2019 08:57:04 +0530 Subject: [PATCH 1/2] fix(version): getting version update (#6717) * fix(version): getting version update * fix(version): getting version update --- frappe/utils/change_log.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/utils/change_log.py b/frappe/utils/change_log.py index 150342d406..cd5b36bf18 100644 --- a/frappe/utils/change_log.py +++ b/frappe/utils/change_log.py @@ -135,7 +135,7 @@ def get_app_last_commit_ref(app): def check_for_update(): updates = frappe._dict(major=[], minor=[], patch=[]) - apps = get_versions() + apps = get_versions() for app in apps: app_details = check_release_on_github(app) @@ -143,7 +143,9 @@ def check_for_update(): github_version, org_name = app_details # Get local instance's current version or the app - instance_version = Version(apps[app]['branch_version'].split(' ')[0]) + + branch_version = apps[app]['branch_version'].split(' ')[0] if apps[app].get('branch_version', '') else '' + instance_version = Version(branch_version or apps[app].get('version')) # Compare and popup update message for update_type in updates: if github_version.__dict__[update_type] > instance_version.__dict__[update_type]: @@ -224,4 +226,3 @@ def show_update_popup(): if update_message: frappe.msgprint(update_message, title=_("New updates are available"), indicator='green') cache.srem("update-user-set", user) - From 480b31587da442dfec967439e0f7eeda9993f452 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 15 Jan 2019 19:35:41 +0600 Subject: [PATCH 2/2] bumped to version 10.1.69 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index cd6f0b8a8d..c5784af033 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template -__version__ = '10.1.68' +__version__ = '10.1.69' __title__ = "Frappe Framework" local = Local()