From e63f87c45bde45749b4eff4cf2f9c605af01c8cd Mon Sep 17 00:00:00 2001
From: Munyoki Kilyungi
Date: Fri, 9 Sep 2022 13:44:20 +0300
Subject: Add missing import

* wqflask/base/trait.py: Import utility.hmac
---
 wqflask/base/trait.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'wqflask/base')

diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index 2ca34028..df561e33 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
@@ -228,7 +228,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()
 
-- 
cgit v1.2.3


From bbddb6b3d8cebfec35b85c840edc85c65493e3e8 Mon Sep 17 00:00:00 2001
From: Munyoki Kilyungi
Date: Fri, 9 Sep 2022 13:44:48 +0300
Subject: Fetch sample values correctly

* wqflask/base/data_set.py (MrnaAssayDataSet.retrieve_sample_data):
Fix indentation.
---
 wqflask/base/data_set.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'wqflask/base')

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:
-- 
cgit v1.2.3