diff options
Diffstat (limited to 'wqflask/base')
-rw-r--r-- | wqflask/base/data_set.py | 10 | ||||
-rw-r--r-- | wqflask/base/trait.py | 3 |
2 files changed, 2 insertions, 11 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py index ade38131..41c94078 100644 --- a/wqflask/base/data_set.py +++ b/wqflask/base/data_set.py @@ -21,8 +21,7 @@ from dataclasses import dataclass from dataclasses import field from dataclasses import InitVar from typing import Optional, Dict, List -from utility.tools import USE_GN_SERVER, USE_REDIS, flat_files, flat_file_exists, GN2_BASE_URL -from pprint import pformat as pf +from utility.tools import USE_REDIS, flat_file_exists, GN2_BASE_URL from utility.db_tools import escape from utility.db_tools import mescape from utility.db_tools import create_in_clause @@ -34,27 +33,22 @@ from utility import webqtlUtil from db import webqtlDatabaseFunction from base import species from base import webqtlConfig -from flask import Flask, g from base.webqtlConfig import TMPDIR from urllib.parse import urlparse from utility.tools import SQL_URI from wqflask.database import database_connection import os import math -import string import collections import codecs import json import requests -import gzip import pickle as pickle -import itertools import hashlib -import datetime - from redis import Redis + r = Redis() # Used by create_database to instantiate objects diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index 26aa687a..21575230 100644 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -5,13 +5,10 @@ from wqflask import app from base import webqtlConfig from base.webqtlCaseData import webqtlCaseData from base.data_set import create_dataset -from utility import hmac from utility.authentication_tools import check_resource_availability from utility.tools import GN2_BASE_URL, GN_PROXY_URL from utility.redis_tools import get_redis_conn, get_resource_id -from utility.db_tools import escape - from flask import g, request, url_for from wqflask.database import database_connection |