From 904e09f0ddfcec987f74536d2bfac9eedc058b36 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Tue, 12 Nov 2019 22:36:30 +0000 Subject: [PATCH] Create utils folder --- README.md | 2 +- rundebug.sh => utils/rundebug.sh | 0 runprod.sh => utils/runprod.sh | 0 runprodguni.sh => utils/runprodguni.sh | 0 setup.py => utils/setup.py | 7 ++++++- 5 files changed, 7 insertions(+), 2 deletions(-) rename rundebug.sh => utils/rundebug.sh (100%) rename runprod.sh => utils/runprod.sh (100%) rename runprodguni.sh => utils/runprodguni.sh (100%) rename setup.py => utils/setup.py (98%) diff --git a/README.md b/README.md index 21e4410..155d271 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Note: you should first read one of the guides on the [Github repo wiki](https:// FLASK_CONFIG=../config.cfg celery -A app.tasks.celery worker # if sqlite -python setup.py -t +python utils/setup.py -t rm db.sqlite && python setup.py -t && FLASK_CONFIG=../config.cfg FLASK_APP=app/__init__.py flask db stamp head # Create migration diff --git a/rundebug.sh b/utils/rundebug.sh similarity index 100% rename from rundebug.sh rename to utils/rundebug.sh diff --git a/runprod.sh b/utils/runprod.sh similarity index 100% rename from runprod.sh rename to utils/runprod.sh diff --git a/runprodguni.sh b/utils/runprodguni.sh similarity index 100% rename from runprodguni.sh rename to utils/runprodguni.sh diff --git a/setup.py b/utils/setup.py similarity index 98% rename from setup.py rename to utils/setup.py index 4fd5ff1..bf9536b 100644 --- a/setup.py +++ b/utils/setup.py @@ -15,7 +15,7 @@ # along with this program. If not, see . -import os, sys, datetime +import os, sys, datetime, inspect if not "FLASK_CONFIG" in os.environ: os.environ["FLASK_CONFIG"] = "../config.cfg" @@ -24,6 +24,11 @@ delete_db = len(sys.argv) >= 2 and sys.argv[1].strip() == "-d" create_db = not (len(sys.argv) >= 2 and sys.argv[1].strip() == "-o") test_data = len(sys.argv) >= 2 and sys.argv[1].strip() == "-t" or not create_db +# Allow finding the `app` module +currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))) +parentdir = os.path.dirname(currentdir) +sys.path.insert(0,parentdir) + from app.models import * from app.utils import make_flask_user_password