diff --git a/hgapp/__init__.py b/hgapp/__init__.py index 4494ab7..f4b993d 100644 --- a/hgapp/__init__.py +++ b/hgapp/__init__.py @@ -27,12 +27,10 @@ assets['hgapp.js'][version] = 'js/app.js' assets['hgapp.css'][version] = 'css/app.css' - # Configure the app -def init_for(env): - coaster.app.init_app(app, env) - db.init_app(app) - db.app = app - baseframe.init_app(app, requires=['baseframe-bs3', 'hgapp']) - lastuser.init_app(app) - lastuser.init_usermanager(UserManager(db, models.User)) +coaster.app.init_app(app) +db.init_app(app) +db.app = app +baseframe.init_app(app, requires=['baseframe-bs3', 'hgapp']) +lastuser.init_app(app) +lastuser.init_usermanager(UserManager(db, models.User)) diff --git a/instance/settings-sample.py b/instance/settings-sample.py index 936ade9..5e1a73e 100644 --- a/instance/settings-sample.py +++ b/instance/settings-sample.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +#: Debug mode (put this value in development.py only, never in settings.py) +DEBUG = True #: Site title SITE_TITLE = 'HasGeek App' #: Site id (for network bar) diff --git a/manage.py b/manage.py index f25386e..191ceab 100755 --- a/manage.py +++ b/manage.py @@ -7,10 +7,10 @@ import hgapp.forms as forms import hgapp.views as views from hgapp.models import db -from hgapp import app, init_for +from hgapp import app if __name__ == '__main__': db.init_app(app) - manager = init_manager(app, db, init_for, hgapp=hgapp, models=models, forms=forms, views=views) + manager = init_manager(app, db, hgapp=hgapp, models=models, forms=forms, views=views) manager.run() diff --git a/requirements.txt b/requirements.txt index c498a56..181e301 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,6 @@ Flask Flask-SQLAlchemy -Flask-Script==0.5.3 Flask-RQ https://github.com/hasgeek/coaster/archive/master.zip https://github.com/hasgeek/baseframe/archive/master.zip https://github.com/hasgeek/flask-lastuser/archive/master.zip -https://github.com/jace/flask-alembic/archive/master.zip diff --git a/rq.sh b/rq.sh index 67555a8..5bc5751 100755 --- a/rq.sh +++ b/rq.sh @@ -1,3 +1,3 @@ #!/bin/bash -rqworker -c rqdev hgapp +rqworker -c rqinit hgapp diff --git a/rqdev.py b/rqdev.py deleted file mode 100644 index 9e3c972..0000000 --- a/rqdev.py +++ /dev/null @@ -1,16 +0,0 @@ -from urlparse import urlparse - -from hgapp import init_for, app - -init_for('dev') - -REDIS_URL = app.config.get('REDIS_URL', 'redis://localhost:6379/0') - -# REDIS_URL is not taken by setup_default_arguments function of rq/scripts/__init__.py -# so, parse it into pieces and give it - -r = urlparse(REDIS_URL) -REDIS_HOST = r.hostname -REDIS_PORT = r.port -REDIS_PASSWORD = r.password -REDIS_DB = 0 diff --git a/rqinit.py b/rqinit.py index ee09605..fa56de9 100644 --- a/rqinit.py +++ b/rqinit.py @@ -1,8 +1,7 @@ from urlparse import urlparse -from hgapp import init_for, app +from hgapp import app -init_for('production') REDIS_URL = app.config.get('REDIS_URL', 'redis://localhost:6379/0') # REDIS_URL is not taken by setup_default_arguments function of rq/scripts/__init__.py diff --git a/runserver.py b/runserver.py index db09ec6..c6c6433 100755 --- a/runserver.py +++ b/runserver.py @@ -2,12 +2,10 @@ # -*- coding: utf-8 -*- import sys -from hgapp import app, init_for -init_for('dev') +from hgapp import app try: port = int(sys.argv[1]) except (IndexError, ValueError): port = 8000 -app.config['DEBUG'] = True app.run('0.0.0.0', port=port) diff --git a/runtests.sh b/runtests.sh index 3f441d4..bc1ede1 100755 --- a/runtests.sh +++ b/runtests.sh @@ -1,3 +1,4 @@ #!/bin/sh +export FLASK_ENV="TESTING" coverage run `which nosetests` coverage report diff --git a/website.py b/website.py index d7f7d5a..3785611 100644 --- a/website.py +++ b/website.py @@ -1,5 +1,4 @@ import sys import os.path sys.path.insert(0, os.path.dirname(__file__)) -from hgapp import app as application, init_for -init_for('production') +from hgapp import app as application