From 2353729629133c97090cab913a283dbe4b29387f Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Thu, 29 Apr 2021 18:08:34 +0200
Subject: [PATCH] working on: 0.0.32 Release

---
 src/covid19/blueprints/admin/admin_views.py               | 3 +--
 src/covid19/blueprints/application/application_model.py   | 4 +---
 src/covid19/blueprints/application/application_workers.py | 3 +--
 src/covid19/blueprints/ecdc/ecdc_model.py                 | 1 -
 src/covid19/blueprints/ecdc/ecdc_views.py                 | 2 +-
 src/covid19/blueprints/owid/owid_model.py                 | 5 ++---
 src/covid19/blueprints/owid/owid_model_import.py          | 3 ---
 src/covid19/blueprints/owid_test/owid_test_service.py     | 7 +------
 src/covid19/blueprints/owid_test/owid_test_views.py       | 6 ++----
 .../blueprints/rki/rki_landkreise/rki_landkreise_model.py | 4 ----
 .../rki/rki_landkreise/rki_landkreise_service_import.py   | 1 -
 .../blueprints/rki/rki_landkreise/rki_landkreise_views.py | 1 -
 .../rki/rki_vaccination/rki_vaccination_service_import.py | 1 -
 .../rki/rki_vaccination/rki_vaccination_views.py          | 2 +-
 src/covid19/blueprints/user/user_model.py                 | 7 +------
 src/covid19/blueprints/user/user_service.py               | 4 ----
 src/covid19/blueprints/user/user_views.py                 | 8 ++------
 src/covid19/blueprints/who/who_model.py                   | 5 ++---
 src/covid19/blueprints/who/who_model_import.py            | 3 ---
 src/covid19/blueprints/who_test/who_test_service.py       | 2 --
 src/covid19/blueprints/who_test/who_test_views.py         | 8 ++------
 src/web/web.py                                            | 4 ----
 22 files changed, 17 insertions(+), 67 deletions(-)

diff --git a/src/covid19/blueprints/admin/admin_views.py b/src/covid19/blueprints/admin/admin_views.py
index 53bbd704..697616db 100644
--- a/src/covid19/blueprints/admin/admin_views.py
+++ b/src/covid19/blueprints/admin/admin_views.py
@@ -1,9 +1,8 @@
 from flask import render_template, redirect, url_for, flash, Blueprint
 from celery import states
 from celery.utils.log import get_task_logger
-from flask_admin.contrib.sqla import ModelView
 
-from database import app, admin, db
+from database import app
 from covid19.blueprints.application.application_services import who_service, ecdc_service, rki_vaccination_service
 from covid19.blueprints.application.application_services import rki_service_bundeslaender, rki_service_landkreise
 from covid19.blueprints.application.application_services import admin_service, owid_service
diff --git a/src/covid19/blueprints/application/application_model.py b/src/covid19/blueprints/application/application_model.py
index 7af9a69e..33fbf81d 100644
--- a/src/covid19/blueprints/application/application_model.py
+++ b/src/covid19/blueprints/application/application_model.py
@@ -1,7 +1,5 @@
-from sqlalchemy import and_, func
-from datetime import date, datetime, time
+from datetime import date, datetime
 from database import db, ITEMS_PER_PAGE
-from sqlalchemy.orm import joinedload
 
 
 class ApplicationDateReported(db.Model):
diff --git a/src/covid19/blueprints/application/application_workers.py b/src/covid19/blueprints/application/application_workers.py
index b7b7ceaf..51fbe15c 100644
--- a/src/covid19/blueprints/application/application_workers.py
+++ b/src/covid19/blueprints/application/application_workers.py
@@ -1,7 +1,6 @@
 import sys
-import subprocess
 from covid19 import app
-from database import create_celery, run_run_with_debug, port, db
+from database import create_celery, db
 from covid19.blueprints.application.application_services import user_service
 from covid19.blueprints.application.application_service import ApplicationService
 
diff --git a/src/covid19/blueprints/ecdc/ecdc_model.py b/src/covid19/blueprints/ecdc/ecdc_model.py
index 055aac10..3d82d4fe 100644
--- a/src/covid19/blueprints/ecdc/ecdc_model.py
+++ b/src/covid19/blueprints/ecdc/ecdc_model.py
@@ -1,5 +1,4 @@
 from sqlalchemy import and_
-from datetime import date
 from database import db, ITEMS_PER_PAGE
 from covid19.blueprints.application.application_model import ApplicationDateReported, ApplicationRegion
 
diff --git a/src/covid19/blueprints/ecdc/ecdc_views.py b/src/covid19/blueprints/ecdc/ecdc_views.py
index 41545393..a7e011ed 100644
--- a/src/covid19/blueprints/ecdc/ecdc_views.py
+++ b/src/covid19/blueprints/ecdc/ecdc_views.py
@@ -3,7 +3,7 @@ from celery import states
 from celery.utils.log import get_task_logger
 from flask_admin.contrib.sqla import ModelView
 
-from database import app, admin, db
+from database import admin, db
 from covid19.blueprints.application.application_services import ecdc_service
 from covid19.blueprints.application.application_workers import celery
 
diff --git a/src/covid19/blueprints/owid/owid_model.py b/src/covid19/blueprints/owid/owid_model.py
index e9b03ad3..5dcfee1d 100644
--- a/src/covid19/blueprints/owid/owid_model.py
+++ b/src/covid19/blueprints/owid/owid_model.py
@@ -1,7 +1,6 @@
-from sqlalchemy import and_, func
+from sqlalchemy import and_
 from datetime import date
-from sqlalchemy.orm import joinedload, load_only, defaultload, defer, undefer, query_expression, subqueryload
-from sqlalchemy.sql import select
+from sqlalchemy.orm import joinedload, subqueryload
 
 from database import db, ITEMS_PER_PAGE
 from covid19.blueprints.application.application_model import ApplicationDateReported, ApplicationRegion
diff --git a/src/covid19/blueprints/owid/owid_model_import.py b/src/covid19/blueprints/owid/owid_model_import.py
index d3b47020..059bfa6a 100644
--- a/src/covid19/blueprints/owid/owid_model_import.py
+++ b/src/covid19/blueprints/owid/owid_model_import.py
@@ -1,7 +1,4 @@
-from sqlalchemy.orm import Load
-from sqlalchemy import func
 from sqlalchemy.orm import Bundle
-from sqlalchemy.orm.strategy_options import load_only
 from database import db, ITEMS_PER_PAGE
 
 
diff --git a/src/covid19/blueprints/owid_test/owid_test_service.py b/src/covid19/blueprints/owid_test/owid_test_service.py
index 9640cb2c..05d7c2ad 100644
--- a/src/covid19/blueprints/owid_test/owid_test_service.py
+++ b/src/covid19/blueprints/owid_test/owid_test_service.py
@@ -1,12 +1,7 @@
-from flask import flash
-
 from database import app
 
 from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
-from covid19.blueprints.application.application_service_download import ApplicationServiceDownload
-from covid19.blueprints.owid.owid_service_import import OwidServiceImport
-from covid19.blueprints.owid.owid_service_update import OwidServiceUpdate
-from covid19.blueprints.owid.owid_model import OwidDateReported, OwidContinent, OwidCountry, OwidData
+from covid19.blueprints.owid.owid_model import OwidDateReported, OwidData
 
 
 class OwidTestService:
diff --git a/src/covid19/blueprints/owid_test/owid_test_views.py b/src/covid19/blueprints/owid_test/owid_test_views.py
index 00837ed8..27dec415 100644
--- a/src/covid19/blueprints/owid_test/owid_test_views.py
+++ b/src/covid19/blueprints/owid_test/owid_test_views.py
@@ -1,14 +1,12 @@
 from flask import render_template, redirect, url_for, flash, Blueprint
-from sqlalchemy.exc import OperationalError
 from celery import states
 from celery.utils.log import get_task_logger
-from flask_admin.contrib.sqla import ModelView
 from flask_login import login_required
 
-from database import app, admin, db
+from database import app, db
 from covid19.blueprints.application.application_services import owid_service
 from covid19.blueprints.application.application_workers import celery
-from covid19.blueprints.owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry
+from covid19.blueprints.owid.owid_model import OwidData
 from covid19.blueprints.owid.owid_model_import import OwidImport
 from covid19.blueprints.application.application_model_transient import ApplicationPage
 
diff --git a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_model.py b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_model.py
index 8c2d1016..b5acfbd5 100644
--- a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_model.py
+++ b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_model.py
@@ -1,7 +1,3 @@
-from sqlalchemy import and_
-from datetime import date
-from sqlalchemy.orm import joinedload
-
 from database import db, ITEMS_PER_PAGE
 
 
diff --git a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_import.py b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_import.py
index c6cbf876..44e8bdff 100644
--- a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_import.py
+++ b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_import.py
@@ -1,4 +1,3 @@
-import sys
 import csv
 import psycopg2
 
diff --git a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_views.py b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_views.py
index dfcf6b68..28978193 100644
--- a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_views.py
+++ b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_views.py
@@ -7,7 +7,6 @@ from database import app, admin, db
 
 from covid19.blueprints.application.application_workers import celery
 from covid19.blueprints.application.application_services import rki_service_landkreise
-from covid19.blueprints.application.application_model import RkiDateReported
 from covid19.blueprints.rki.rki_landkreise.rki_landkreise_model import RkiLandkreise
 from covid19.blueprints.rki.rki_landkreise.rki_landkreise_model_import import RkiLandkreiseImport
 from covid19.blueprints.application.application_model_transient import ApplicationPage
diff --git a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_import.py b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_import.py
index a4e4bf02..06faaed6 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_import.py
+++ b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_import.py
@@ -1,4 +1,3 @@
-import os
 import csv
 import psycopg2
 
diff --git a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py
index 9c89afac..7b684f58 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py
+++ b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py
@@ -3,7 +3,7 @@ from celery import states
 from celery.utils.log import get_task_logger
 from flask_admin.contrib.sqla import ModelView
 
-from database import app, admin, db
+from database import admin, db
 from covid19.blueprints.application.application_services import rki_vaccination_service
 from covid19.blueprints.application.application_workers import celery
 
diff --git a/src/covid19/blueprints/user/user_model.py b/src/covid19/blueprints/user/user_model.py
index 9fbf6eb7..f1559069 100644
--- a/src/covid19/blueprints/user/user_model.py
+++ b/src/covid19/blueprints/user/user_model.py
@@ -1,14 +1,9 @@
-from sqlalchemy import and_, func
-from datetime import date
 from database import db, ITEMS_PER_PAGE
-from sqlalchemy.orm import joinedload
 from flask_login import UserMixin, AnonymousUserMixin
-from wtforms import Form, BooleanField, StringField, validators
+from wtforms import validators
 from werkzeug.security import generate_password_hash, check_password_hash
 from flask_wtf import FlaskForm
 from wtforms import StringField, PasswordField, BooleanField, SubmitField
-from wtforms.validators import ValidationError, DataRequired, Email, EqualTo
-from covid19.blueprints.application.application_model import ApplicationDateReported, ApplicationRegion
 
 
 class User(UserMixin, db.Model):
diff --git a/src/covid19/blueprints/user/user_service.py b/src/covid19/blueprints/user/user_service.py
index 61ce8719..240d6acf 100644
--- a/src/covid19/blueprints/user/user_service.py
+++ b/src/covid19/blueprints/user/user_service.py
@@ -1,7 +1,3 @@
-from flask import flash
-from flask_login import login_manager
-from werkzeug.security import generate_password_hash, check_password_hash
-
 from database import app
 from covid19.blueprints.user.user_model import User, LoginForm
 
diff --git a/src/covid19/blueprints/user/user_views.py b/src/covid19/blueprints/user/user_views.py
index 76eafe67..e1b15b42 100644
--- a/src/covid19/blueprints/user/user_views.py
+++ b/src/covid19/blueprints/user/user_views.py
@@ -1,16 +1,12 @@
 from flask import render_template, redirect, url_for, flash, Blueprint
 from sqlalchemy.exc import OperationalError
-from celery import states
-from celery.utils.log import get_task_logger
 from flask_admin.contrib.sqla import ModelView
-from flask_login import AnonymousUserMixin, login_required, login_user, logout_user
+from flask_login import login_required, logout_user
 from flask_login import current_user, login_user
 import flask
 
 
-from database import app, admin, db, login_manager
-from covid19.blueprints.application.application_services import user_service
-from covid19.blueprints.application.application_workers import celery
+from database import admin, db, login_manager
 
 from covid19.blueprints.user.user_model import User, LoginForm
 from covid19.blueprints.application.application_model_transient import ApplicationPage
diff --git a/src/covid19/blueprints/who/who_model.py b/src/covid19/blueprints/who/who_model.py
index dac88da0..39165196 100644
--- a/src/covid19/blueprints/who/who_model.py
+++ b/src/covid19/blueprints/who/who_model.py
@@ -1,7 +1,6 @@
-from sqlalchemy import and_, func
+from sqlalchemy import and_
 from datetime import date
-from sqlalchemy.orm import joinedload, load_only, defaultload, defer, undefer, query_expression, subqueryload
-from sqlalchemy.sql import select
+from sqlalchemy.orm import joinedload, subqueryload
 from database import db, ITEMS_PER_PAGE
 from covid19.blueprints.application.application_model import ApplicationDateReported, ApplicationRegion
 
diff --git a/src/covid19/blueprints/who/who_model_import.py b/src/covid19/blueprints/who/who_model_import.py
index fb5e3da5..e02f1261 100644
--- a/src/covid19/blueprints/who/who_model_import.py
+++ b/src/covid19/blueprints/who/who_model_import.py
@@ -1,7 +1,4 @@
-from sqlalchemy.orm import Load
-from sqlalchemy import func
 from sqlalchemy.orm import Bundle
-from sqlalchemy.orm.strategy_options import load_only
 from database import db, ITEMS_PER_PAGE
 
 
diff --git a/src/covid19/blueprints/who_test/who_test_service.py b/src/covid19/blueprints/who_test/who_test_service.py
index 26a1be17..565d5e8e 100644
--- a/src/covid19/blueprints/who_test/who_test_service.py
+++ b/src/covid19/blueprints/who_test/who_test_service.py
@@ -1,5 +1,3 @@
-from flask import flash
-
 from database import app
 from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.who.who_model import WhoDateReported, WhoData
diff --git a/src/covid19/blueprints/who_test/who_test_views.py b/src/covid19/blueprints/who_test/who_test_views.py
index 5445165d..d6126688 100644
--- a/src/covid19/blueprints/who_test/who_test_views.py
+++ b/src/covid19/blueprints/who_test/who_test_views.py
@@ -1,20 +1,16 @@
 from flask import render_template, redirect, url_for, flash, Blueprint
-from sqlalchemy.exc import OperationalError
 from celery import states
 from celery.utils.log import get_task_logger
-from flask_admin.contrib.sqla import ModelView
 from flask_login import login_required
 
-from database import app, admin, db
+from database import app, db
 from covid19.blueprints.application.application_services import who_service
 from covid19.blueprints.application.application_workers import celery
 
 from covid19.blueprints.who.who_model_import import WhoImport
-from covid19.blueprints.who.who_model import WhoRegion, WhoCountry, WhoDateReported, WhoData
+from covid19.blueprints.who.who_model import WhoData
 from covid19.blueprints.application.application_model_transient import ApplicationPage
 
-from covid19.blueprints.who.who_views import app_who
-
 from covid19.blueprints.who_test.who_test_service import WhoTestService
 
 who_test_service = WhoTestService(db, who_service)
diff --git a/src/web/web.py b/src/web/web.py
index 657bfe44..cd585a01 100644
--- a/src/web/web.py
+++ b/src/web/web.py
@@ -1,7 +1,3 @@
-from database import app, run_run_with_debug, port
-import covid19
-import covid19.blueprints.application.application_views
-
 from covid19 import run_web
 
 # ---------------------------------------------------------------------------------
-- 
GitLab