From d629511e8f9db19d0c108c2eaed65fbe4abb7e8e Mon Sep 17 00:00:00 2001 From: thomaswoehlke <thomas.woehlke@gmail.com> Date: Wed, 28 Apr 2021 13:44:57 +0200 Subject: [PATCH] working on: 0.0.32 Release --- requirements/dev.in | 2 +- src/database.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/dev.in b/requirements/dev.in index c5c09f52..e6fb63e7 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -9,7 +9,7 @@ Flask-Login==0.5.0 SQLAlchemy>=1.4.5 celery[redis]>=5.0.5 psycopg2-binary>=2.8.6 -mariadb==1.0.6 +PyMySQL==1.0.2 wget>=3.2 pyecharts>=1.9.0 pyecharts-extras>=0.0.5 diff --git a/src/database.py b/src/database.py index d9c77b78..538e812e 100644 --- a/src/database.py +++ b/src/database.py @@ -24,7 +24,7 @@ def create_app(): login_manager.login_view = 'usr.login' login_manager.init_app(my_app) my_app.config.from_object("config") - my_db_url_mysql = "mysql+pymysql://{user}:{pw}@{url}/{db}".format( + my_db_url_mariadb = "mariadb+pymysql://{user}:{pw}@{url}/{db}?charset=utf8mb4".format( user=my_app.config['SQLALCHEMY_DATABASE_USER'], pw=my_app.config['SQLALCHEMY_DATABASE_PW'], url=my_app.config['SQLALCHEMY_DATABASE_HOST'], @@ -34,7 +34,7 @@ def create_app(): pw=my_app.config['SQLALCHEMY_DATABASE_PW'], url=my_app.config['SQLALCHEMY_DATABASE_HOST'], db=my_app.config['SQLALCHEMY_DATABASE_DB']) - my_app.config['SQLALCHEMY_DATABASE_URI'] = my_db_url_mysql + my_app.config['SQLALCHEMY_DATABASE_URI'] = my_db_url_mariadb my_app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False # silence the deprecation warning my_app.config['FLASK_ADMIN_SWATCH'] = 'superhero' # cache.init_app(app) -- GitLab