From 58b1bb26746021d19ba169870de0aa0652aba2bd Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Fri, 28 May 2021 19:44:19 +0200
Subject: [PATCH] git_commit_and_push via make

---
 Makefile             | 15 ++++++++++++---
 etc/requirements.txt |  1 +
 src/config.py        |  6 +++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 27f8a850..b29a62bc 100644
--- a/Makefile
+++ b/Makefile
@@ -112,13 +112,22 @@ vcs_commit:
 	git add .
 	git commit -m "git_commit_and_push via make"
 
-vcs_push:
+vcs_checkin:
 	git push
 
-vcs_pull:
+vcs_checkout:
+	git submodule update
 	git pull
 
-vcs: vcs_commit vcs_push vcs_pull
+vcs_setup:
+	git submodule init
+	git submodule update
+	git config --global diff.submodule log
+	git submodule update --remote --merge
+
+vcs_push: vcs_setup vcs_commit vcs_checkin vcs_checkout
+
+vcs_pull: vcs_setup vcs_checkout
 
 love:
 	@echo "not war!"
diff --git a/etc/requirements.txt b/etc/requirements.txt
index cd4bd393..459ff55c 100644
--- a/etc/requirements.txt
+++ b/etc/requirements.txt
@@ -72,6 +72,7 @@ Pillow==8.2.0
 pip-licenses==3.3.1
 pip-tools==6.1.0
 pipenv==2020.11.15
+pkg-resources==0.0.0
 plantuml==0.3.0
 plantuml-gentools==0.1.2
 plantuml-markdown==3.4.2
diff --git a/src/config.py b/src/config.py
index d537674e..4bc20f3f 100644
--- a/src/config.py
+++ b/src/config.py
@@ -5,10 +5,10 @@ CELERY_CONF_WORKER_SEND_TASK_EVENTS = True
 CELERY_CONF_TASK_SEND_SENT_EVENT = True
 CELERY_LOG_REDIRECT = '1'
 CELERY_LOG_REDIRECT_LEVEL = 'INFO'
-SQLALCHEMY_DATABASE_USER = 'covid19data'
-SQLALCHEMY_DATABASE_PW = 'covid19datapwd'
+SQLALCHEMY_DATABASE_USER = 'flask_covid19'
+SQLALCHEMY_DATABASE_PW = 'flask_covid19pwd'
 SQLALCHEMY_DATABASE_HOST = 'localhost'
-SQLALCHEMY_DATABASE_DB = 'covid19data'
+SQLALCHEMY_DATABASE_DB = 'flask_covid19'
 CACHE_TYPE = 'MemcachedCache'
 CACHE_MEMCACHED_SERVERS = '127.0.0.1:11211'
 CACHE_DEFAULT_TIMEOUT = 120
-- 
GitLab