working on: 0.0.32 Release

requirements/dev.txt

@@ -174,8 +174,6 @@ more-itertools==8.0.2
     # via
     #   jaraco.functools
     #   pytest-enabler
-mysql-connector-python==8.0.24
-    # via -r requirements/dev.in
 nodeenv==1.5.0
     # via pre-commit
 numba==0.52.0
@@ -235,8 +233,6 @@ prettytable==2.0.0
     # via pyecharts
 prompt-toolkit==3.0.16
     # via click-repl
-protobuf==3.15.8
-    # via mysql-connector-python
 psutil==5.8.0
     # via mirakuru
 psycopg2-binary==2.8.6
@@ -348,7 +344,6 @@ six==1.15.0
     #   cycler
     #   flask-cors
     #   flask-fixtures
-    #   protobuf
     #   python-dateutil
     #   sqlalchemy-utils
     #   virtualenv

src/config.py

@@ -9,11 +9,11 @@ SQLALCHEMY_DATABASE_USER = 'covid19data'
 SQLALCHEMY_DATABASE_PW = 'covid19datapwd'
 SQLALCHEMY_DATABASE_HOST = 'localhost'
 SQLALCHEMY_DATABASE_DB = 'covid19data'
-SQLALCHEMY_ITEMS_PER_PAGE = 10
+SQLALCHEMY_ITEMS_PER_PAGE = 20
 SQLALCHEMY_TRACK_MODIFICATIONS = True
 FLASK_ADMIN_SWATCH = 'superhero'
 FLASK_APP_DEBUGGER_ACTIVE = True
-PORT = 9090
 USER_ADMIN_LOGIN = 'admin@admin.de'
 USER_ADMIN_USERNAME = 'admin'
 USER_ADMIN_PASSWORD = 'pbkdf2:sha256:150000$O4SZaWF5$85ad348809215aa7fe0a16f79dc61228e7d0fb214c24df68b0745f1570ffc148'
+PORT = 9090

src/covid19/blueprints/admin/admin_service.py

@@ -24,9 +24,9 @@ class AdminService:
     def run_admin_database_dump(self):
         app.logger.info(" run database dump [begin]")
         app.logger.info("------------------------------------------------------------")
-        user = app.config['SQLALCHEMY_POSTGRES_USER']
-        url = app.config['SQLALCHEMY_POSTGRES_URL']
-        db = app.config['SQLALCHEMY_POSTGRES_DB']
+        user = app.config['SQLALCHEMY_DATABASE_USER']
+        url = app.config['SQLALCHEMY_DATABASE_HOST']
+        db = app.config['SQLALCHEMY_DATABASE_DB']
         cmd = 'pg_dump -U '+user+' -h '+url+' '+db\
               +' --clean --if-exists --no-tablespaces '\
               +' --on-conflict-do-nothing --rows-per-insert=1000 --column-inserts '\
@@ -58,9 +58,9 @@ class AdminService:
         flash(" run database dump reimport [begin]")
         app.logger.info(" run database dump reimport [begin]")
         app.logger.info("------------------------------------------------------------")
-        user = app.config['SQLALCHEMY_POSTGRES_USER']
-        url = app.config['SQLALCHEMY_POSTGRES_URL']
-        db = app.config['SQLALCHEMY_POSTGRES_DB']
+        user = app.config['SQLALCHEMY_DATABASE_USER']
+        url = app.config['SQLALCHEMY_DATABASE_HOST']
+        db = app.config['SQLALCHEMY_DATABASE_DB']
         cmd_list = [
             'psql -U ' + user + ' -h ' + url + ' ' + db + ' < ' + self.file_path
         ]

src/database.py

@@ -8,10 +8,6 @@ from flask_login import LoginManager
 from logging.config import dictConfig
 from flask_admin import Admin
 from celery import Celery
-import sqlalchemy.dialects
-from sqlalchemy.dialects import postgresql, mysql, sqlite
-
-
 # TODO: #210 database.py: logging for Celery on Windows
 from celery.utils.log import LoggingProxy
 
@@ -28,18 +24,13 @@ 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 = "mysql+mysqldb://{user}:{pw}@{url}/{db}".format(
-        user=my_app.config['SQLALCHEMY_DATABASE_USER'],
-        pw=my_app.config['SQLALCHEMY_DATABASE_PW'],
-        url=my_app.config['SQLALCHEMY_DATABASE_HOST'],
-        db=my_app.config['SQLALCHEMY_DATABASE_DB'])
-    my_db_url_postgresql = 'postgresql+psycopg2://{user}:{pw}@{url}/{db}'.format(
+    my_db_url = 'postgresql+psycopg2://{user}:{pw}@{url}/{db}'.format(
         user=my_app.config['SQLALCHEMY_DATABASE_USER'],
         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_mariadb
-    my_app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True  # silence the deprecation warning
+    my_app.config['SQLALCHEMY_DATABASE_URI'] = my_db_url
+    my_app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False  # silence the deprecation warning
     my_app.config['FLASK_ADMIN_SWATCH'] = 'superhero'
     # cache.init_app(app)
     return my_app