aboutsummaryrefslogtreecommitdiff
path: root/wqflask/utility/tools.py
diff options
context:
space:
mode:
authorPjotr Prins2017-03-05 11:20:07 +0000
committerPjotr Prins2017-03-05 11:20:07 +0000
commit1c72c2ff02eb571368051464543caf0b44521666 (patch)
tree9fc0ce5d1acf15b52f0f1016a3767883d247adc1 /wqflask/utility/tools.py
parent55bbc368c6a02ebfb8f754dfbe7ee5f60edea66b (diff)
parent2b14b0d04387a262f9895ddd87ce465c6835fa8c (diff)
downloadgenenetwork2-1c72c2ff02eb571368051464543caf0b44521666.tar.gz
Merge branch 'master' of github.com:zsloan/genenetwork2 into zsloan
Diffstat (limited to 'wqflask/utility/tools.py')
-rw-r--r--wqflask/utility/tools.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/wqflask/utility/tools.py b/wqflask/utility/tools.py
index 9860f63e..82ef136f 100644
--- a/wqflask/utility/tools.py
+++ b/wqflask/utility/tools.py
@@ -217,9 +217,11 @@ USE_REDIS = get_setting_bool('USE_REDIS')
USE_GN_SERVER = get_setting_bool('USE_GN_SERVER')
GENENETWORK_FILES = get_setting('GENENETWORK_FILES')
+TEMP_TRAITS = get_setting('TEMP_TRAITS')
PYLMM_COMMAND = pylmm_command()
GEMMA_COMMAND = gemma_command()
+GEMMA_RESULTS_PATH = get_setting('GEMMA_RESULTS_PATH')
PLINK_COMMAND = plink_command()
TEMPDIR = tempdir() # defaults to UNIX TMPDIR