diff --git a/lib/hawat/config.py b/lib/hawat/config.py index 4e05a3a1703c244622312a84c6bfe9cec6b5bb18..391499371b164105d3a1dea444e572b7540d1689 100644 --- a/lib/hawat/config.py +++ b/lib/hawat/config.py @@ -76,6 +76,16 @@ class Config(vial.config.Config): # pylint: disable=locally-disabled,too-few-pu MAIL_DEFAULT_SENDER = '{}@{}'.format(APPLICATION_ID, socket.getfqdn()) MAIL_SUBJECT_PREFIX = '[{}]'.format(APPLICATION_NAME) + # + # Flask-Migrate configurations. + # + MIGRATE_DIRECTORY = os.path.join( + os.path.dirname( + os.path.abspath(__file__) + ), + 'migrations' + ) + #--------------------------------------------------------------------------- # Custom application configurations. #--------------------------------------------------------------------------- diff --git a/lib/vial/app.py b/lib/vial/app.py index a6be78c96283ebe098783701e9a17c61bdc53e09..5ac947d0f99becf5cfaa40fd56b3ce848c9b3dac 100644 --- a/lib/vial/app.py +++ b/lib/vial/app.py @@ -604,14 +604,7 @@ class Vial(flask.Flask): # pylint: disable=locally-disabled,too-many-instance-a migrate = flask_migrate.Migrate( app = self, db = dbh, - directory = os.path.realpath( - os.path.join( - os.path.dirname( - os.path.abspath(__file__) - ), - 'migrations' - ) - ) + directory = self.config['MIGRATE_DIRECTORY'] ) self.set_resource(vial.const.RESOURCE_MIGRATE, migrate) @@ -794,8 +787,6 @@ class Vial(flask.Flask): # pylint: disable=locally-disabled,too-many-instance-a """ vial.intl.BABEL.init_app(self) self.set_resource(vial.const.RESOURCE_BABEL, vial.intl.BABEL) - self.cli.add_command(vial.intl.WINTL_CLI) - self.cli.add_command(vial.intl.RINTL_CLI) @self.route('/locale/<code>') def locale(code): # pylint: disable=locally-disabled,unused-variable diff --git a/lib/vial/config.py b/lib/vial/config.py index 2abd5c9c07d2532c729fd3194b4f102578bd7c7b..16185b77d3665edc246803c0f98a519f5c67c984 100644 --- a/lib/vial/config.py +++ b/lib/vial/config.py @@ -10,6 +10,7 @@ This module contains default *Vial* application configurations. """ +import os import socket import collections @@ -69,6 +70,16 @@ class Config: # pylint: disable=locally-disabled,too-few-public-methods # SQLALCHEMY_TRACK_MODIFICATIONS = False + # + # Flask-Migrate configurations. + # + MIGRATE_DIRECTORY = os.path.join( + os.path.dirname( + os.path.abspath(__file__) + ), + 'migrations' + ) + #--------------------------------------------------------------------------- # Custom application configurations. #---------------------------------------------------------------------------