aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPjotr Prins2015-04-19 17:03:10 +0000
committerPjotr Prins2015-04-19 17:03:10 +0000
commit4f4ceddafa1d172515b2ef24658e5cf39730e6c6 (patch)
treea5aafc1e2ba0de95a40084c8fc2ddfbf9c4a43c6
parent561ad00c82f440aefd5dbaf741d927cb63a37e0f (diff)
downloadgenenetwork2-4f4ceddafa1d172515b2ef24658e5cf39730e6c6.tar.gz
Pick up PYLMM_PATH from environment or setting.py
-rwxr-xr-xwqflask/wqflask/marker_regression/marker_regression.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/wqflask/wqflask/marker_regression/marker_regression.py b/wqflask/wqflask/marker_regression/marker_regression.py
index 8d3eba48..67e1df0d 100755
--- a/wqflask/wqflask/marker_regression/marker_regression.py
+++ b/wqflask/wqflask/marker_regression/marker_regression.py
@@ -42,11 +42,11 @@ from utility import temp_data
from utility.benchmark import Bench
import os
-if os.environ['PYLMM_PATH'] is None:
- PYLMM_PATH=app.config['PYLMM_PATH']
+if os.environ.get('PYLMM_PATH') is None:
+ PYLMM_PATH=app.config.get('PYLMM_PATH')
if PYLMM_PATH is None:
PYLMM_PATH=os.environ['HOME']+'/gene/wqflask/wqflask/my_pylmm/pyLMM'
-if !os.path.isfile(PYLMM_PATH+'lmm.py'):
+if not os.path.isfile(PYLMM_PATH+'/lmm.py'):
raise 'PYLMM_PATH unknown or faulty'
PYLMM_COMMAND= 'python '+PYLMM_PATH+'/lmm.py'