aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
authorzsloan2017-09-05 16:49:02 +0000
committerzsloan2017-09-05 16:49:02 +0000
commit76e1810abb05457a4c38c8fcebce334f5d1493bf (patch)
tree49da62b3c7bf2ca0e79734ae6d374670af3690f6 /wqflask
parent03e2facd6279f5413667dfcca4b2d223a54e4f4e (diff)
parent90aab8b2f41f3a017d70e069c8812110ce3d30fb (diff)
downloadgenenetwork2-76e1810abb05457a4c38c8fcebce334f5d1493bf.tar.gz
Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testing
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/utility/tools.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/wqflask/utility/tools.py b/wqflask/utility/tools.py
index 867bc5c8..c5685cdd 100644
--- a/wqflask/utility/tools.py
+++ b/wqflask/utility/tools.py
@@ -113,6 +113,9 @@ def pylmm_command(guess=None):
def gemma_command(guess=None):
return assert_bin(get_setting("GEMMA_COMMAND",guess))
+def gemma_wrapper_command(guess=None):
+ return assert_bin(get_setting("GEMMA_WRAPPER_COMMAND",guess))
+
def plink_command(guess=None):
return assert_bin(get_setting("PLINK_COMMAND",guess))
@@ -240,10 +243,11 @@ JS_GUIX_PATH = get_setting('JS_GUIX_PATH')
JS_GN_PATH = get_setting('JS_GN_PATH')
# assert_dir(JS_GN_PATH)
-PYLMM_COMMAND = pylmm_command()
-GEMMA_COMMAND = gemma_command()
-PLINK_COMMAND = plink_command()
-TEMPDIR = tempdir() # defaults to UNIX TMPDIR
+PYLMM_COMMAND = pylmm_command()
+GEMMA_COMMAND = gemma_command()
+GEMMA_WRAPPER_COMMAND = gemma_wrapper_command()
+PLINK_COMMAND = plink_command()
+TEMPDIR = tempdir() # defaults to UNIX TMPDIR
# ---- Handle specific JS modules
JS_TWITTER_POST_FETCHER_PATH = get_setting("JS_TWITTER_POST_FETCHER_PATH",js_path("Twitter-Post-Fetcher"))