aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuriithi Frederick Muriuki2022-09-09 13:52:53 +0300
committerGitHub2022-09-09 13:52:53 +0300
commite0bbbb4dba379afd887d428f776597dcc7fc6af4 (patch)
tree7632da230dec99cfeed0d8eec4dec9b4b3a1a945
parent2e62574ee56817571083ecde0ce465f800617a63 (diff)
parentbbddb6b3d8cebfec35b85c840edc85c65493e3e8 (diff)
downloadgenenetwork2-e0bbbb4dba379afd887d428f776597dcc7fc6af4.tar.gz
Merge pull request #732 from BonfaceKilz/bug/fix-broken-correlations
Bug/fix broken correlations
-rw-r--r--wqflask/base/data_set.py4
-rw-r--r--wqflask/base/trait.py3
2 files changed, 3 insertions, 4 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 6c6deea9..67515111 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -1181,9 +1181,9 @@ ProbeFreeze.Id = ProbeSetFreeze.ProbeFreezeId AND ProbeSetFreeze.Name = %s"""
"ProbeSetXRef.DataId = ProbeSetData.Id "
"AND ProbeSetData.StrainId = Strain.Id "
"ORDER BY Strain.Name",
- (trait, self.name)
+ (trait, self.name,)
)
- return cursor.fetchall()
+ return cursor.fetchall()
def retrieve_genes(self, column_name):
with database_connection() as conn, conn.cursor() as cursor:
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index ad8706ef..d8a2ec08 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -1,7 +1,7 @@
import requests
import simplejson as json
from wqflask import app
-
+from utility import hmac
from base import webqtlConfig
from base.webqtlCaseData import webqtlCaseData
from base.data_set import create_dataset
@@ -229,7 +229,6 @@ def retrieve_sample_data(trait, dataset, samplelist=None):
results = Redis.get(trait.name).split()
else:
results = dataset.retrieve_sample_data(trait.name)
-
# Todo: is this necessary? If not remove
trait.data.clear()