aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPjotr Prins2016-06-23 05:20:34 +0000
committerPjotr Prins2016-06-23 05:20:34 +0000
commit93c1742a91c478667b8645c458cce2108eb24b14 (patch)
tree3906f5cb7ad6ed2063069e104e910b195c35b471
parente6154e0a4397625793109b9a292dedb314ec00b7 (diff)
downloadgenenetwork2-93c1742a91c478667b8645c458cce2108eb24b14.tar.gz
Refactored dir name dbFunction to db
-rw-r--r--wqflask/base/data_set.py2
-rw-r--r--wqflask/base/trait.py2
-rw-r--r--wqflask/basicStatistics/BasicStatisticsFunctions.py2
-rw-r--r--wqflask/db/__init__.py (renamed from wqflask/dbFunction/__init__.py)0
-rw-r--r--wqflask/db/webqtlDatabaseFunction.py (renamed from wqflask/dbFunction/webqtlDatabaseFunction.py)0
-rw-r--r--wqflask/wqflask/correlation/correlation_functions.py2
-rw-r--r--wqflask/wqflask/correlation/show_corr_results.py2
-rw-r--r--wqflask/wqflask/correlation_matrix/show_corr_matrix.py2
-rw-r--r--wqflask/wqflask/do_search.py4
-rw-r--r--wqflask/wqflask/gsearch.py2
-rw-r--r--wqflask/wqflask/marker_regression/MarkerRegressionPage.py2
-rw-r--r--wqflask/wqflask/search_results.py2
-rw-r--r--wqflask/wqflask/show_trait/show_trait.py2
-rw-r--r--wqflask/wqflask/update_search_results.py2
14 files changed, 13 insertions, 13 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index f75447f6..a7b6e402 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -40,7 +40,7 @@ import reaper
from base import webqtlConfig
from base import species
-from dbFunction import webqtlDatabaseFunction
+from db import webqtlDatabaseFunction
from utility import webqtlUtil
from utility.benchmark import Bench
from utility import chunks
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index b51b8c72..3dc4ddda 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -9,7 +9,7 @@ from htmlgen import HTMLgen2 as HT
from base import webqtlConfig
from base.webqtlCaseData import webqtlCaseData
from base.data_set import create_dataset
-from dbFunction import webqtlDatabaseFunction
+from db import webqtlDatabaseFunction
from utility import webqtlUtil
from wqflask import app
diff --git a/wqflask/basicStatistics/BasicStatisticsFunctions.py b/wqflask/basicStatistics/BasicStatisticsFunctions.py
index e748a822..1e5646a1 100644
--- a/wqflask/basicStatistics/BasicStatisticsFunctions.py
+++ b/wqflask/basicStatistics/BasicStatisticsFunctions.py
@@ -16,7 +16,7 @@ from htmlgen import HTMLgen2 as HT
#from utility import Plot
from utility import webqtlUtil
from base import webqtlConfig
-from dbFunction import webqtlDatabaseFunction
+from db import webqtlDatabaseFunction
def basicStatsTable(vals, trait_type=None, cellid=None, heritability=None):
print("basicStatsTable called - len of vals", len(vals))
diff --git a/wqflask/dbFunction/__init__.py b/wqflask/db/__init__.py
index e69de29b..e69de29b 100644
--- a/wqflask/dbFunction/__init__.py
+++ b/wqflask/db/__init__.py
diff --git a/wqflask/dbFunction/webqtlDatabaseFunction.py b/wqflask/db/webqtlDatabaseFunction.py
index e30929d2..e30929d2 100644
--- a/wqflask/dbFunction/webqtlDatabaseFunction.py
+++ b/wqflask/db/webqtlDatabaseFunction.py
diff --git a/wqflask/wqflask/correlation/correlation_functions.py b/wqflask/wqflask/correlation/correlation_functions.py
index b25005d3..80a0818c 100644
--- a/wqflask/wqflask/correlation/correlation_functions.py
+++ b/wqflask/wqflask/correlation/correlation_functions.py
@@ -34,7 +34,7 @@ import string
from utility import webqtlUtil
from base.mrna_assay_tissue_data import MrnaAssayTissueData
from base.trait import GeneralTrait
-from dbFunction import webqtlDatabaseFunction
+from db import webqtlDatabaseFunction
from flask import Flask, g
diff --git a/wqflask/wqflask/correlation/show_corr_results.py b/wqflask/wqflask/correlation/show_corr_results.py
index 7738cbed..71f03d05 100644
--- a/wqflask/wqflask/correlation/show_corr_results.py
+++ b/wqflask/wqflask/correlation/show_corr_results.py
@@ -46,7 +46,7 @@ from utility.TDCell import TDCell
from base.trait import GeneralTrait
from base import data_set
from utility import webqtlUtil, helper_functions, corr_result_helpers
-from dbFunction import webqtlDatabaseFunction
+from db import webqtlDatabaseFunction
import utility.webqtlUtil #this is for parallel computing only.
from wqflask.correlation import correlation_functions
from utility.benchmark import Bench
diff --git a/wqflask/wqflask/correlation_matrix/show_corr_matrix.py b/wqflask/wqflask/correlation_matrix/show_corr_matrix.py
index 7b67e626..caf48a45 100644
--- a/wqflask/wqflask/correlation_matrix/show_corr_matrix.py
+++ b/wqflask/wqflask/correlation_matrix/show_corr_matrix.py
@@ -48,7 +48,7 @@ from utility.TDCell import TDCell
from base.trait import GeneralTrait
from base import data_set
from utility import webqtlUtil, helper_functions, corr_result_helpers
-from dbFunction import webqtlDatabaseFunction
+from db import webqtlDatabaseFunction
import utility.webqtlUtil #this is for parallel computing only.
from wqflask.correlation import correlation_functions
from utility.benchmark import Bench
diff --git a/wqflask/wqflask/do_search.py b/wqflask/wqflask/do_search.py
index bf0a06d2..ff64b518 100644
--- a/wqflask/wqflask/do_search.py
+++ b/wqflask/wqflask/do_search.py
@@ -10,7 +10,7 @@ from pprint import pformat as pf
import sys
# sys.path.append("..") Never in a running webserver
-from dbFunction import webqtlDatabaseFunction
+from db import webqtlDatabaseFunction
import logging
from utility.logger import getLogger
@@ -966,7 +966,7 @@ if __name__ == "__main__":
from base.data_set import create_dataset
from base.templatePage import templatePage
from utility import webqtlUtil
- from dbFunction import webqtlDatabaseFunction
+ from db import webqtlDatabaseFunction
db_conn = MySQLdb.Connect(db=webqtlConfig.DB_NAME,
host=webqtlConfig.MYSQL_SERVER,
diff --git a/wqflask/wqflask/gsearch.py b/wqflask/wqflask/gsearch.py
index 23b7f869..5072f931 100644
--- a/wqflask/wqflask/gsearch.py
+++ b/wqflask/wqflask/gsearch.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import, print_function, division
from flask import Flask, g
from base.data_set import create_dataset
from base.trait import GeneralTrait
-from dbFunction import webqtlDatabaseFunction
+from db import webqtlDatabaseFunction
from utility.benchmark import Bench
diff --git a/wqflask/wqflask/marker_regression/MarkerRegressionPage.py b/wqflask/wqflask/marker_regression/MarkerRegressionPage.py
index a9e0328c..deb47ad0 100644
--- a/wqflask/wqflask/marker_regression/MarkerRegressionPage.py
+++ b/wqflask/wqflask/marker_regression/MarkerRegressionPage.py
@@ -37,7 +37,7 @@ from base.webqtlTrait import webqtlTrait
from base.templatePage import templatePage
from utility import webqtlUtil
from base import webqtlConfig
-from dbFunction import webqtlDatabaseFunction
+from db import webqtlDatabaseFunction
from base.GeneralObject import GeneralObject
import reaper
diff --git a/wqflask/wqflask/search_results.py b/wqflask/wqflask/search_results.py
index 1a034bdd..3d57dce0 100644
--- a/wqflask/wqflask/search_results.py
+++ b/wqflask/wqflask/search_results.py
@@ -32,7 +32,7 @@ from base.trait import GeneralTrait
from wqflask import parser
from wqflask import do_search
from utility import webqtlUtil,tools
-from dbFunction import webqtlDatabaseFunction
+from db import webqtlDatabaseFunction
from utility import formatting
diff --git a/wqflask/wqflask/show_trait/show_trait.py b/wqflask/wqflask/show_trait/show_trait.py
index a8ff0fdf..7c961091 100644
--- a/wqflask/wqflask/show_trait/show_trait.py
+++ b/wqflask/wqflask/show_trait/show_trait.py
@@ -18,7 +18,7 @@ from wqflask.show_trait.SampleList import SampleList
from utility import webqtlUtil, Plot, Bunch, helper_functions
from base.trait import GeneralTrait
from base import data_set
-from dbFunction import webqtlDatabaseFunction
+from db import webqtlDatabaseFunction
from basicStatistics import BasicStatisticsFunctions
from pprint import pformat as pf
diff --git a/wqflask/wqflask/update_search_results.py b/wqflask/wqflask/update_search_results.py
index 166649a4..7681e7fb 100644
--- a/wqflask/wqflask/update_search_results.py
+++ b/wqflask/wqflask/update_search_results.py
@@ -5,7 +5,7 @@ import json
from flask import Flask, g
from base.data_set import create_dataset
from base.trait import GeneralTrait
-from dbFunction import webqtlDatabaseFunction
+from db import webqtlDatabaseFunction
from utility.benchmark import Bench