From ad5de7736a6aa5f3b04c7712e7dfc4884daf9113 Mon Sep 17 00:00:00 2001 From: thomaswoehlke <thomas.woehlke@gmail.com> Date: Thu, 20 May 2021 06:51:03 +0200 Subject: [PATCH] Refactoring: rename covid19 to flask_covid19 --- src/flask_covid19/blueprints/app_admin/app_admin_views.py | 2 +- src/flask_covid19/blueprints/app_all/all_views.py | 2 +- src/flask_covid19/blueprints/app_mq/application_workers.py | 3 +-- src/flask_covid19/blueprints/divi/divi_views.py | 2 +- src/flask_covid19/blueprints/ecdc/ecdc_views.py | 2 +- src/flask_covid19/blueprints/owid/owid_views.py | 2 +- src/flask_covid19/blueprints/rki_cases/rki_views.py | 2 +- .../blueprints/rki_vaccination/rki_vaccination_views.py | 2 +- src/flask_covid19/blueprints/who/who_views.py | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/flask_covid19/blueprints/app_admin/app_admin_views.py b/src/flask_covid19/blueprints/app_admin/app_admin_views.py index 51d11777..c60f681c 100644 --- a/src/flask_covid19/blueprints/app_admin/app_admin_views.py +++ b/src/flask_covid19/blueprints/app_admin/app_admin_views.py @@ -7,7 +7,7 @@ from flask_covid19.blueprints.app_all.all_services import who_service, owid_serv from flask_covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service from flask_covid19.blueprints.app_all.all_services import ecdc_service, divi_service from flask_covid19.blueprints.app_all.all_services import app_admin_service, app_user_service -from flask_covid19 import celery +from flask_covid19.blueprints.app_mq.application_workers import celery from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage drop_and_create_data_again = True diff --git a/src/flask_covid19/blueprints/app_all/all_views.py b/src/flask_covid19/blueprints/app_all/all_views.py index e926eb25..e27c882a 100644 --- a/src/flask_covid19/blueprints/app_all/all_views.py +++ b/src/flask_covid19/blueprints/app_all/all_views.py @@ -7,7 +7,7 @@ from flask_covid19.blueprints.app_all.all_services import who_service, owid_serv from flask_covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service from flask_covid19.blueprints.app_all.all_services import ecdc_service, divi_service from flask_covid19.blueprints.app_all.all_services import app_admin_service, app_user_service, all_service -from flask_covid19 import celery +from flask_covid19.blueprints.app_mq.application_workers import celery from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage drop_and_create_data_again = True diff --git a/src/flask_covid19/blueprints/app_mq/application_workers.py b/src/flask_covid19/blueprints/app_mq/application_workers.py index 05ce1a7c..20193793 100644 --- a/src/flask_covid19/blueprints/app_mq/application_workers.py +++ b/src/flask_covid19/blueprints/app_mq/application_workers.py @@ -1,6 +1,5 @@ import sys -from flask_covid19 import app -from database import create_celery, db +from database import create_celery, db, app from flask_covid19 import app_user_service from flask_covid19 import ApplicationService diff --git a/src/flask_covid19/blueprints/divi/divi_views.py b/src/flask_covid19/blueprints/divi/divi_views.py index 95779ed5..e1d26020 100644 --- a/src/flask_covid19/blueprints/divi/divi_views.py +++ b/src/flask_covid19/blueprints/divi/divi_views.py @@ -7,7 +7,7 @@ from flask_login import login_required from database import app, admin, db from flask_covid19 import divi_service -from flask_covid19 import celery +from flask_covid19.blueprints.app_mq.application_workers import celery from flask_covid19 import ApplicationPage from flask_covid19 import DiviRegion, DiviDateReported, DiviCountry, DiviData diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_views.py b/src/flask_covid19/blueprints/ecdc/ecdc_views.py index 5d737100..f32728bf 100644 --- a/src/flask_covid19/blueprints/ecdc/ecdc_views.py +++ b/src/flask_covid19/blueprints/ecdc/ecdc_views.py @@ -6,7 +6,7 @@ from flask_admin.contrib.sqla import ModelView from database import admin, db from flask_covid19 import who_service, owid_service from flask_covid19 import ecdc_service -from flask_covid19 import celery +from flask_covid19.blueprints.app_mq.application_workers import celery from flask_covid19 import EcdcImport from flask_covid19 import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData diff --git a/src/flask_covid19/blueprints/owid/owid_views.py b/src/flask_covid19/blueprints/owid/owid_views.py index d1bd6c34..b9302b97 100644 --- a/src/flask_covid19/blueprints/owid/owid_views.py +++ b/src/flask_covid19/blueprints/owid/owid_views.py @@ -9,7 +9,7 @@ from flask_covid19 import who_service, owid_service from flask_covid19 import rki_service, rki_vaccination_service from flask_covid19 import ecdc_service, divi_service from flask_covid19 import app_admin_service, app_user_service -from flask_covid19 import celery +from flask_covid19.blueprints.app_mq.application_workers import celery from flask_covid19 import ApplicationPage from flask_covid19 import OwidDateReported, OwidData, OwidContinent, OwidCountry from flask_covid19 import OwidImport diff --git a/src/flask_covid19/blueprints/rki_cases/rki_views.py b/src/flask_covid19/blueprints/rki_cases/rki_views.py index 50b092d1..48fc58b0 100644 --- a/src/flask_covid19/blueprints/rki_cases/rki_views.py +++ b/src/flask_covid19/blueprints/rki_cases/rki_views.py @@ -4,7 +4,7 @@ from flask_admin.contrib.sqla import ModelView from celery import states from database import app, admin, db -from flask_covid19 import celery +from flask_covid19.blueprints.app_mq.application_workers import celery from flask_covid19 import who_service, owid_service from flask_covid19 import rki_service, rki_vaccination_service from flask_covid19 import ecdc_service, divi_service diff --git a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py index 8ad8ba63..ff67dc8a 100644 --- a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py +++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py @@ -8,7 +8,7 @@ from flask_covid19 import who_service, owid_service from flask_covid19 import rki_service, rki_vaccination_service from flask_covid19 import ecdc_service, divi_service from flask_covid19 import app_admin_service, app_user_service -from flask_covid19 import celery +from flask_covid19.blueprints.app_mq.application_workers import celery from flask_covid19 import RkiVaccinationData, RkiVaccinationDateReported from flask_covid19 import RkiVaccinationImport diff --git a/src/flask_covid19/blueprints/who/who_views.py b/src/flask_covid19/blueprints/who/who_views.py index 1430f5e3..cad3cfa6 100644 --- a/src/flask_covid19/blueprints/who/who_views.py +++ b/src/flask_covid19/blueprints/who/who_views.py @@ -7,7 +7,7 @@ from flask_login import login_required from database import app, admin, db from flask_covid19.blueprints.app_all.all_services import who_service -from flask_covid19 import celery +from flask_covid19.blueprints.app_mq.application_workers import celery from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage from flask_covid19.blueprints.who.who_model_import import WhoImport -- GitLab