aboutsummaryrefslogtreecommitdiff
path: root/wqflask/utility
diff options
context:
space:
mode:
authorzsloan2017-05-22 10:40:11 -0500
committerGitHub2017-05-22 10:40:11 -0500
commit9d4cb56608ca5de3495ede9149443e772a25d706 (patch)
treed5f46ddc75bb6a7b4135147cc1c25a1cfa64a871 /wqflask/utility
parent02ce39e33fd32b68411ac7b30449507c3f567192 (diff)
parent8677d1b7bd5b32791c440bf0de2fc4c61c98299f (diff)
downloadgenenetwork2-9d4cb56608ca5de3495ede9149443e772a25d706.tar.gz
Merge pull request #254 from pjotrp/diet-merge
Merge from the diet branch
Diffstat (limited to 'wqflask/utility')
-rw-r--r--wqflask/utility/tools.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/wqflask/utility/tools.py b/wqflask/utility/tools.py
index c28c617a..d46a84ba 100644
--- a/wqflask/utility/tools.py
+++ b/wqflask/utility/tools.py
@@ -205,21 +205,24 @@ SQL_URI = get_setting('SQL_URI')
LOG_LEVEL = get_setting('LOG_LEVEL')
LOG_LEVEL_DEBUG = get_setting_int('LOG_LEVEL_DEBUG')
LOG_SQL = get_setting_bool('LOG_SQL')
-LOG_SQLALCHEMY = get_setting_bool('LOG_SQLALCHEMY')
+LOG_SQL_ALCHEMY = get_setting_bool('LOG_SQL_ALCHEMY')
LOG_BENCH = get_setting_bool('LOG_BENCH')
LOG_FORMAT = "%(message)s" # not yet in use
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')
+GUIX_JS_PATH = get_setting('GUIX_JS_PATH')
+assert_dir(GUIX_JS_PATH)
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
+TWITTER_POST_FETCHER_JS_PATH = GUIX_JS_PATH + "/Twitter-Post-Fetcher"
+assert_dir(TWITTER_POST_FETCHER_JS_PATH)
+
from six import string_types
if os.environ.get('WQFLASK_OVERRIDES'):
@@ -234,5 +237,3 @@ if os.environ.get('WQFLASK_OVERRIDES'):
else:
OVERRIDES[k] = cmd
logger.debug(OVERRIDES)
-
-assert_dir(get_setting("TWITTER_POST_FETCHER_JS_PATH"))