From bff30f44fbf7b73cfa89818d420063e8588c4bf8 Mon Sep 17 00:00:00 2001 From: thomaswoehlke <thomas.woehlke@gmail.com> Date: Thu, 28 Jan 2021 15:25:28 +0100 Subject: [PATCH] work --- database.py | 10 ---------- org/woehlke/covid19/europe/europe_model.py | 1 - org/woehlke/covid19/europe/europe_service.py | 6 +----- org/woehlke/covid19/rki/rki_model.py | 1 - org/woehlke/covid19/rki/rki_service_update.py | 2 +- org/woehlke/covid19/vaccination/vaccination_model.py | 1 - org/woehlke/covid19/who/who_model.py | 1 - 7 files changed, 2 insertions(+), 20 deletions(-) diff --git a/database.py b/database.py index dc48a5ca..92f2a1d2 100644 --- a/database.py +++ b/database.py @@ -1,7 +1,6 @@ from flask import Flask from flask_cors import CORS from flask_sqlalchemy import SQLAlchemy -from datetime import date app = Flask('app') CORS(app) @@ -31,12 +30,3 @@ my_logging_config = { } } run_run_with_debug = app.config['APP_DEBUGGER_ACTIVE'] - - -def transform_datum(my_date_reported): - my_date_reported = my_date_reported.split("-") - my_year = int(my_date_reported[0]) - my_month = int(my_date_reported[1]) - my_day = int(my_date_reported[2]) - my_datum = date(my_year, my_month, my_day) - return my_datum diff --git a/org/woehlke/covid19/europe/europe_model.py b/org/woehlke/covid19/europe/europe_model.py index 9fc75c5e..c493061c 100644 --- a/org/woehlke/covid19/europe/europe_model.py +++ b/org/woehlke/covid19/europe/europe_model.py @@ -1,4 +1,3 @@ -import uuid from sqlalchemy import and_ from datetime import date from database import db, ITEMS_PER_PAGE diff --git a/org/woehlke/covid19/europe/europe_service.py b/org/woehlke/covid19/europe/europe_service.py index 295cd52d..19bc64a3 100644 --- a/org/woehlke/covid19/europe/europe_service.py +++ b/org/woehlke/covid19/europe/europe_service.py @@ -1,9 +1,5 @@ import os -import csv -import psycopg2 -import wget -from database import db, app -from org.woehlke.covid19.europe.europe_model import EuropeDataImportTable +from database import app from org.woehlke.covid19.europe.europe_service_download import EuropeServiceDownload from org.woehlke.covid19.europe.europe_service_import import EuropeServiceImport from org.woehlke.covid19.europe.europe_service_update import EuropeServiceUpdate diff --git a/org/woehlke/covid19/rki/rki_model.py b/org/woehlke/covid19/rki/rki_model.py index ded473d5..d7e48c2c 100644 --- a/org/woehlke/covid19/rki/rki_model.py +++ b/org/woehlke/covid19/rki/rki_model.py @@ -1,4 +1,3 @@ -import uuid from sqlalchemy import and_, func from datetime import date from database import db, ITEMS_PER_PAGE diff --git a/org/woehlke/covid19/rki/rki_service_update.py b/org/woehlke/covid19/rki/rki_service_update.py index c8e4fe9a..e180855a 100644 --- a/org/woehlke/covid19/rki/rki_service_update.py +++ b/org/woehlke/covid19/rki/rki_service_update.py @@ -1,4 +1,4 @@ -from database import db, app, transform_datum +from database import db, app from org.woehlke.covid19.rki.rki_model import RkiRegion, RkiDateReported, RkiCountry, RkiGermanyData from org.woehlke.covid19.rki.rki_model import RkiGermanyDataImportTable diff --git a/org/woehlke/covid19/vaccination/vaccination_model.py b/org/woehlke/covid19/vaccination/vaccination_model.py index 5ad95a0d..f07cd13e 100644 --- a/org/woehlke/covid19/vaccination/vaccination_model.py +++ b/org/woehlke/covid19/vaccination/vaccination_model.py @@ -1,4 +1,3 @@ -import uuid from database import db, ITEMS_PER_PAGE diff --git a/org/woehlke/covid19/who/who_model.py b/org/woehlke/covid19/who/who_model.py index 65b5e236..bf7fbe0e 100644 --- a/org/woehlke/covid19/who/who_model.py +++ b/org/woehlke/covid19/who/who_model.py @@ -1,4 +1,3 @@ -import uuid from sqlalchemy import and_, func from datetime import date from database import db, ITEMS_PER_PAGE -- GitLab