From 8677d1b7bd5b32791c440bf0de2fc4c61c98299f Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Sun, 21 May 2017 07:21:44 +0000
Subject: Merge from the diet branch.

  * refactored ./bin/genenetwork2 and /etc/default_settings
    - better detection of Guix
    - removed unused parameters, such as GEMMA_RESULT_PATH and TEMP_TRAITS
    - removing some default settings, such as PYLMM_COMMAND
    - rename some settings, such as SQL_URI and LOG_SQL_ALCHEMY
    - added GUIX_JS_PATH for JS modules
  * Added documentation on installing binary GN2
  * Updated Twitter board to latest version in Guix - it had broken
  * Updated many tools in the latest Guix profile
---
 wqflask/maintenance/gen_select_dataset.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wqflask/maintenance')

diff --git a/wqflask/maintenance/gen_select_dataset.py b/wqflask/maintenance/gen_select_dataset.py
index e5726656..a5fd86e2 100644
--- a/wqflask/maintenance/gen_select_dataset.py
+++ b/wqflask/maintenance/gen_select_dataset.py
@@ -57,7 +57,7 @@ import urlparse
 
 from pprint import pformat as pf
 
-#Engine = sa.create_engine(zach_settings.SQLALCHEMY_DATABASE_URI)
+#Engine = sa.create_engine(zach_settings.SQL_URI)
 
 # build MySql database connection
 
-- 
cgit v1.2.3