diff options
Diffstat (limited to 'uploader/population')
| -rw-r--r-- | uploader/population/rqtl2.py | 3 | ||||
| -rw-r--r-- | uploader/population/views.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/uploader/population/rqtl2.py b/uploader/population/rqtl2.py index 9968bd6..436eca0 100644 --- a/uploader/population/rqtl2.py +++ b/uploader/population/rqtl2.py @@ -12,6 +12,7 @@ import MySQLdb as mdb from redis import Redis from MySQLdb.cursors import DictCursor from werkzeug.utils import secure_filename +from gn_libs.mysqldb import database_connection from flask import ( flash, escape, @@ -29,7 +30,7 @@ from r_qtl import r_qtl2 from uploader import jobs from uploader.files import save_file, fullpath from uploader.species.models import all_species -from uploader.db_utils import with_db_connection, database_connection +from uploader.db_utils import with_db_connection from uploader.authorisation import require_login from uploader.platforms.models import platform_by_id, platforms_by_species diff --git a/uploader/population/views.py b/uploader/population/views.py index 36201ba..4f985f5 100644 --- a/uploader/population/views.py +++ b/uploader/population/views.py @@ -3,6 +3,7 @@ import json import base64 from MySQLdb.cursors import DictCursor +from gn_libs.mysqldb import database_connection from flask import (flash, request, url_for, @@ -15,7 +16,6 @@ from uploader.oauth2.client import oauth2_post from uploader.ui import make_template_renderer from uploader.authorisation import require_login from uploader.genotypes.views import genotypesbp -from uploader.db_utils import database_connection from uploader.datautils import enumerate_sequence from uploader.phenotypes.views import phenotypesbp from uploader.expression_data.views import exprdatabp |