diff --git a/requirements/dev.in b/requirements/dev.in index e6fb63e711142376208ba1e63edc8e0f8558771a..509a88ffc08a326516fa5855e4a914701b1a5df4 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -8,8 +8,7 @@ Flask-Admin>=1.5.7 Flask-Login==0.5.0 SQLAlchemy>=1.4.5 celery[redis]>=5.0.5 -psycopg2-binary>=2.8.6 -PyMySQL==1.0.2 +mariadb==1.0.6 wget>=3.2 pyecharts>=1.9.0 pyecharts-extras>=0.0.5 diff --git a/src/database.py b/src/database.py index 538e812e107f8d810071772f703dc32526b00bbe..28d260a8154eef477ddad2306703a9c3b97840b3 100644 --- a/src/database.py +++ b/src/database.py @@ -8,6 +8,9 @@ from flask_login import LoginManager from logging.config import dictConfig from flask_admin import Admin from celery import Celery +import sqlalchemy.dialects + + # TODO: #210 database.py: logging for Celery on Windows from celery.utils.log import LoggingProxy @@ -24,7 +27,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_mariadb = "mariadb+pymysql://{user}:{pw}@{url}/{db}?charset=utf8mb4".format( + my_db_url_mariadb = "mariadb+mariadbconnector://{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'],