Browse Source

Merge branch 'master' of ssh://gogs.davidventura.com.ar:2222/tati/voices-of-merseyside

Tatiana Inama 6 years ago
parent
commit
5ad75dec34
4 changed files with 19 additions and 11 deletions
  1. 10 1
      backend/backend/app.py
  2. 2 0
      backend/build.sh
  3. 7 3
      backend/setup.py
  4. 0 7
      backend/utils/create_db.py

+ 10 - 1
backend/backend/app.py

@@ -1,3 +1,7 @@
+import os
+
+from pathlib import Path
+
 import waitress
 import waitress
 
 
 from backend.api import Payload
 from backend.api import Payload
@@ -9,11 +13,16 @@ from flask_restful import Api
 
 
 def create_app():
 def create_app():
     app = Flask(__name__)
     app = Flask(__name__)
-    app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////home/david/tanya.db'
+    DB_PATH = os.environ.get('DB_PATH', '/home/david/tanya.db')
+    app.config['SQLALCHEMY_DATABASE_URI'] = f'sqlite:///{DB_PATH}'
     db.init_app(app)
     db.init_app(app)
 
 
     api = Api(app)
     api = Api(app)
     api.add_resource(Payload, '/')
     api.add_resource(Payload, '/')
+
+    if not Path(DB_PATH).exists():
+        with app.app_context():
+            db.create_all()
     return app
     return app
 
 
 def start(prod=True):
 def start(prod=True):

+ 2 - 0
backend/build.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+shiv -e backend.app:start -o webserver -E --compile-pyc .

+ 7 - 3
backend/setup.py

@@ -7,11 +7,11 @@ setup(name='backend',
         author='',
         author='',
         author_email='',
         author_email='',
         license='',
         license='',
-        packages=['backend'],
+        packages=['backend', 'utils'],
         zip_safe=False,
         zip_safe=False,
         entry_points={
         entry_points={
             'console_scripts': [
             'console_scripts': [
-                'webserver = backend.app:start'
+                'webserver=backend.app:start',
                 ],
                 ],
             },
             },
         install_requires=[
         install_requires=[
@@ -21,4 +21,8 @@ setup(name='backend',
             'psycopg2-binary==2.8.4',
             'psycopg2-binary==2.8.4',
             'SQLAlchemy==1.3.15',
             'SQLAlchemy==1.3.15',
             'waitress==1.4.3',
             'waitress==1.4.3',
-            ])
+            ],
+        extras_require={
+            'dev':
+            ['shiv==0.1.2']
+            })

+ 0 - 7
backend/utils/create_db.py

@@ -1,7 +0,0 @@
-from backend.app import create_app
-from backend.database import db
-
-app = create_app()
-with app.app_context():
-    db.create_all()
-    print('DB created')