sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-12-25 02:44:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

Browse Source
This commit is contained in:
Stephan Porada 2019-08-28 10:54:50 +02:00
commit e5ea98510e
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/__init__.py
View File

@ -1,6 +1,6 @@
from config import config from config import config
from flask import Flask from flask import Flask
from flask_apscheduler import APScheduler # from flask_apscheduler import APScheduler
from flask_login import LoginManager from flask_login import LoginManager
from flask_mail import Mail from flask_mail import Mail
from flask_socketio import SocketIO from flask_socketio import SocketIO
@ -11,7 +11,7 @@ db = SQLAlchemy()
login_manager = LoginManager() login_manager = LoginManager()
login_manager.login_view = 'auth.login' login_manager.login_view = 'auth.login'
mail = Mail() mail = Mail()
scheduler = APScheduler() # scheduler = APScheduler()
socketio = SocketIO() socketio = SocketIO()

17
opaque.py
View File

@ -1,14 +1,7 @@
import eventlet import eventlet
eventlet.monkey_patch(os=True, eventlet.monkey_patch()
select=True,
socket=True,
thread=False,
time=True,
psycopg=True)
from dotenv import load_dotenv from dotenv import load_dotenv
load_dotenv() load_dotenv()
from app import create_app, db, socketio from app import create_app, db, socketio
from app.models import Corpus, User, Role, Permission, Job from app.models import Corpus, User, Role, Permission, Job
from flask_migrate import Migrate from flask_migrate import Migrate
@ -19,10 +12,6 @@ app = create_app(os.getenv('FLASK_CONFIG') or 'default')
migrate = Migrate(app, db) migrate = Migrate(app, db)
if __name__ == '__main__':
socketio.run(app)
@app.shell_context_processor @app.shell_context_processor
def make_shell_context(): def make_shell_context():
return dict(db=db, return dict(db=db,
@ -39,3 +28,7 @@ def test():
import unittest import unittest
tests = unittest.TestLoader().discover('tests') tests = unittest.TestLoader().discover('tests')
unittest.TextTestRunner(verbosity=2).run(tests) unittest.TextTestRunner(verbosity=2).run(tests)
if __name__ == '__main__':
socketio.run(app)