aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
authorPjotr Prins2016-04-20 10:44:10 +0000
committerPjotr Prins2016-04-20 10:44:10 +0000
commit28ccde8e417b965710bbeef48d468a6b717c10a4 (patch)
treea72275a798bec47785f0e810b799a8ba2c351009 /wqflask
parent9164ffc23879a8f9338939c06c36d3d49c3c899a (diff)
downloadgenenetwork2-28ccde8e417b965710bbeef48d468a6b717c10a4.tar.gz
A few fixes to get the webserver running again
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/utility/tools.py1
-rw-r--r--wqflask/wqflask/marker_regression/gemma_mapping.py4
-rw-r--r--wqflask/wqflask/marker_regression/marker_regression.py4
3 files changed, 3 insertions, 6 deletions
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