diff --git a/frappe/__version__.py b/frappe/__version__.py index db01fb213a..b56d675263 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1 +1 @@ -__version__ = "4.6.0" +__version__ = "4.6.1" diff --git a/frappe/hooks.py b/frappe/hooks.py index 5fa757ee3a..682ac1fa7a 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -3,7 +3,7 @@ app_title = "Frappe Framework" app_publisher = "Web Notes Technologies Pvt. Ltd." app_description = "Full Stack Web Application Framework in Python" app_icon = "assets/frappe/images/frappe.svg" -app_version = "4.6.0" +app_version = "4.6.1" app_color = "#3498db" app_email = "support@frappe.io" diff --git a/frappe/installer.py b/frappe/installer.py index 33613e5ee2..2c6379a493 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -10,6 +10,7 @@ import os, json import frappe import frappe.database import getpass +import importlib from frappe.model.db_schema import DbManager from frappe.model.sync import sync_for from frappe.utils.fixtures import sync_fixtures @@ -33,6 +34,7 @@ def install_db(root_login="root", root_password=None, db_name=None, source_sql=N frappe.connect(db_name=db_name) import_db_from_sql(source_sql, verbose) + remove_missing_apps() create_auth_table() frappe.flags.in_install_db = False @@ -198,3 +200,14 @@ def add_module_defs(app): d.app_name = app d.module_name = module d.save() + +def remove_missing_apps(): + apps = ('frappe_subscription',) + installed_apps = frappe.get_installed_apps() + for app in apps: + if app in installed_apps: + try: + importlib.import_module(app) + except ImportError: + installed_apps.remove(app) + frappe.db.set_global("installed_apps", json.dumps(installed_apps)) diff --git a/setup.py b/setup.py index 85cc737ba2..38dd4061d9 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.6.0" +version = "4.6.1" with open("requirements.txt", "r") as f: install_requires = f.readlines()