Merge branch 'master' of https://github.com/uc-cdis/peregrine

uc-cdis · Mar 22, 2018 · 56f9af1 · 56f9af1
2 parents 67d8abc + 3b14cc9
commit 56f9af1
Show file tree

Hide file tree

Showing 15 changed files with 1,429 additions and 1,792 deletions.
diff --git a/peregrine/api.py b/peregrine/api.py
@@ -10,7 +10,6 @@
 import datamodelutils
 from dictionaryutils import DataDictionary, dictionary as dict_init
 from userdatamodel.driver import SQLAlchemyDriver
-
 from cdispyutils.log import get_handler
 
 import peregrine
@@ -65,7 +64,6 @@ def db_init(app):
     app.userdb = SQLAlchemyDriver(app.config['PSQL_USER_DB_CONNECTION'])
     flask_scoped_session(app.userdb.Session, app)
 
-
     try:
         app.logger.info('Initializing Auth driver')
         app.auth = AuthDriver(app.config["AUTH_ADMIN_CREDS"], app.config["INTERNAL_AUTH"])