From 28ccde8e417b965710bbeef48d468a6b717c10a4 Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Wed, 20 Apr 2016 10:44:10 +0000
Subject: A few fixes to get the webserver running again

---
 wqflask/utility/tools.py                               | 1 -
 wqflask/wqflask/marker_regression/gemma_mapping.py     | 4 +---
 wqflask/wqflask/marker_regression/marker_regression.py | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/utility/tools.py b/wqflask/utility/tools.py
index 9405a9c6..dd8c4a1e 100644
--- a/wqflask/utility/tools.py
+++ b/wqflask/utility/tools.py
@@ -5,7 +5,6 @@ import os
 import sys
 from wqflask import app
 
-
 def get_setting(command_id,guess=None):
     """Resolve a setting from the environment or the global settings in
     app.config, with get_valid_path is a function checking whether the
diff --git a/wqflask/wqflask/marker_regression/gemma_mapping.py b/wqflask/wqflask/marker_regression/gemma_mapping.py
index ae426621..8fb086c1 100644
--- a/wqflask/wqflask/marker_regression/gemma_mapping.py
+++ b/wqflask/wqflask/marker_regression/gemma_mapping.py
@@ -1,9 +1,7 @@
 import os
 
 from base import webqtlConfig
-from utility.tools import gemma_command
-
-GEMMA_PATH,GEMMA_COMMAND = gemma_command()
+from utility.tools import GEMMA_COMMAND
 
 def run_gemma(this_dataset, samples, vals): 
     """Generates p-values for each marker using GEMMA"""
diff --git a/wqflask/wqflask/marker_regression/marker_regression.py b/wqflask/wqflask/marker_regression/marker_regression.py
index 39d7c78a..97949f93 100644
--- a/wqflask/wqflask/marker_regression/marker_regression.py
+++ b/wqflask/wqflask/marker_regression/marker_regression.py
@@ -1103,5 +1103,5 @@ def get_markers_from_csv(included_markers, p_values, group_name):
 
     return markers
     
- if __name__ == '__main__':
-     import cPickle as pickle
+if __name__ == '__main__':
+    import cPickle as pickle
-- 
cgit v1.2.3