From cd58c17faec400968cfe6a3595ebe02099edd691 Mon Sep 17 00:00:00 2001 From: Zachary Sloan Date: Fri, 22 Mar 2013 21:51:07 +0000 Subject: Removed zach_settings.py from git tracking Changed mysql password as a result of it being up on git before --- wqflask/cfg/default_settings.py | 3 ++ wqflask/cfg/zach_settings.py | 5 -- wqflask/wqflask/my_pylmm/pylmmKinship.py | 2 +- wqflask/wqflask/templates/base.html | 82 ++++++++++++++++---------------- 4 files changed, 45 insertions(+), 47 deletions(-) delete mode 100644 wqflask/cfg/zach_settings.py (limited to 'wqflask') diff --git a/wqflask/cfg/default_settings.py b/wqflask/cfg/default_settings.py index 1811ccfd..53b5a96e 100644 --- a/wqflask/cfg/default_settings.py +++ b/wqflask/cfg/default_settings.py @@ -3,3 +3,6 @@ LOGFILE = """/tmp/flask_gn_log""" #This is needed because Flask turns key errors into a #400 bad request response with no exception/log TRAP_BAD_REQUEST_ERRORS = True + +#SECURITY_CONFIRMABLE = True +SECURITY_TRACKABLE = True \ No newline at end of file diff --git a/wqflask/cfg/zach_settings.py b/wqflask/cfg/zach_settings.py deleted file mode 100644 index 1970bd9c..00000000 --- a/wqflask/cfg/zach_settings.py +++ /dev/null @@ -1,5 +0,0 @@ -LOGFILE = """/tmp/flask_gn_log""" - -TRAP_BAD_REQUEST_ERRORS = True - -DB_URI = """mysql://webqtl:f2ZypIflRM@gn.cazhbciu2y1i.us-east-1.rds.amazonaws.com/db_webqtl""" diff --git a/wqflask/wqflask/my_pylmm/pylmmKinship.py b/wqflask/wqflask/my_pylmm/pylmmKinship.py index 403e739d..db1449a4 100644 --- a/wqflask/wqflask/my_pylmm/pylmmKinship.py +++ b/wqflask/wqflask/my_pylmm/pylmmKinship.py @@ -122,7 +122,7 @@ np.savetxt(outFile,K) if options.saveEig: if options.verbose: sys.stderr.write("Obtaining Eigendecomposition\n") - Kva,Kve = linalg.eigh(K) + Kva, Kve = linalg.eigh(K) if options.verbose: sys.stderr.write("Saving eigendecomposition to %s.[kva | kve]\n" % outFile) np.savetxt(outFile+".kva",Kva) diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html index 590f5789..71c12941 100644 --- a/wqflask/wqflask/templates/base.html +++ b/wqflask/wqflask/templates/base.html @@ -26,49 +26,49 @@
-
-
- - GeneNetwork -
-
+
+
- {% block content %}{% endblock %} -- cgit v1.2.3