From bbc12d6db4b40247e02377b2c24d933243dd7cc1 Mon Sep 17 00:00:00 2001 From: zsloan Date: Mon, 9 Sep 2019 16:24:41 -0500 Subject: Revert "Add option to hide columns in correlation results" This reverts commit cc12fe06593f4957fb2b5b641ebe7e5cf43453b1. Mistakenly included changes to tools.py that are only for the new guix build --- wqflask/utility/tools.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'wqflask/utility') diff --git a/wqflask/utility/tools.py b/wqflask/utility/tools.py index a2eb0817..31ab2046 100644 --- a/wqflask/utility/tools.py +++ b/wqflask/utility/tools.py @@ -105,7 +105,7 @@ def js_path(module=None): try_guix = get_setting("JS_GUIX_PATH")+"/"+module if valid_path(try_guix): return try_guix - raise Exception("No JS path found for "+module+" (if not in Guix check JS_GN_PATH)") + raise "No JS path found for "+module+" (if not in Guix check JS_GN_PATH)" def reaper_command(guess=None): return get_setting("REAPER_COMMAND",guess) @@ -291,8 +291,7 @@ assert_dir(JS_GUIX_PATH) assert_dir(JS_GUIX_PATH+'/cytoscape-panzoom') CSS_PATH = "UNKNOWN" # assert_dir(JS_PATH) -#JS_TWITTER_POST_FETCHER_PATH = get_setting("JS_TWITTER_POST_FETCHER_PATH",js_path("Twitter-Post-Fetcher")) -JS_TWITTER_POST_FETCHER_PATH = get_setting("JS_TWITTER_POST_FETCHER_PATH",js_path("javascript-twitter-post-fetcher")) +JS_TWITTER_POST_FETCHER_PATH = get_setting("JS_TWITTER_POST_FETCHER_PATH",js_path("Twitter-Post-Fetcher")) assert_dir(JS_TWITTER_POST_FETCHER_PATH) assert_file(JS_TWITTER_POST_FETCHER_PATH+"/js/twitterFetcher_min.js") JS_CYTOSCAPE_PATH = get_setting("JS_CYTOSCAPE_PATH",js_path("cytoscape")) -- cgit 1.4.1