diff options
| -rwxr-xr-x | wqflask/base/webqtlConfig.py | 4 | ||||
| -rw-r--r-- | wqflask/requirements.txt | 8 | ||||
| -rw-r--r-- | wqflask/wqflask/correlation/correlationFunction.py | 2 | ||||
| -rw-r--r-- | wqflask/wqflask/correlation/show_corr_results.py | 2 | ||||
| -rw-r--r-- | wqflask/wqflask/search_results.py | 6 | ||||
| -rw-r--r-- | wqflask/wqflask/show_trait/SampleList.py | 2 |
6 files changed, 9 insertions, 15 deletions
diff --git a/wqflask/base/webqtlConfig.py b/wqflask/base/webqtlConfig.py index 755595e0..d5f09b64 100755 --- a/wqflask/base/webqtlConfig.py +++ b/wqflask/base/webqtlConfig.py @@ -63,8 +63,8 @@ CMDLINEDIR = HTMLPATH + 'webqtl/cmdLine/' ChangableHtmlPath = GNROOT + 'web/' SITENAME = 'GN' -PORTADDR = "http://132.192.47.32" -BASEHREF = '<base href="http://132.192.47.32/">' +PORTADDR = "http://50.16.251.170" +BASEHREF = '<base href="http://50.16.251.170/">' INFOPAGEHREF = '/dbdoc/%s.html' GLOSSARYFILE = "/glossary.html" CGIDIR = '/webqtl/' #XZ: The variable name 'CGIDIR' should be changed to 'PYTHONDIR' diff --git a/wqflask/requirements.txt b/wqflask/requirements.txt index d775ff21..cd75ae9a 100644 --- a/wqflask/requirements.txt +++ b/wqflask/requirements.txt @@ -3,20 +3,12 @@ Jinja2==2.6 MySQL-python==1.2.3 Piddle==0.1-dev PyYAML==3.10 -Reaper==1.0 SQLAlchemy==0.7.9 Werkzeug==0.8.3 -ipython==0.13.1 logging-tree==1.1 -logilab-astng==0.24.1 -logilab-common==0.58.3 -mercurial==2.4.2 nose==1.2.1 -numarray==1.5.2 numpy==1.6.2 pp==1.6.3 -pylint==0.26.0 -readline==6.2.4.1 requests==0.13.3 rpy2==2.3.1 scipy==0.11.0 diff --git a/wqflask/wqflask/correlation/correlationFunction.py b/wqflask/wqflask/correlation/correlationFunction.py index 2c1870fe..7d4b58a9 100644 --- a/wqflask/wqflask/correlation/correlationFunction.py +++ b/wqflask/wqflask/correlation/correlationFunction.py @@ -31,7 +31,7 @@ import pp import string from utility import webqtlUtil -from base.webqtlTrait import GeneralTrait +from base.trait import GeneralTrait from dbFunction import webqtlDatabaseFunction diff --git a/wqflask/wqflask/correlation/show_corr_results.py b/wqflask/wqflask/correlation/show_corr_results.py index b82f1c59..96298b37 100644 --- a/wqflask/wqflask/correlation/show_corr_results.py +++ b/wqflask/wqflask/correlation/show_corr_results.py @@ -46,7 +46,7 @@ import reaper from base import webqtlConfig from utility.THCell import THCell from utility.TDCell import TDCell -from base.webqtlTrait import GeneralTrait +from base.trait import GeneralTrait from base import data_set from base.templatePage import templatePage from utility import webqtlUtil, helper_functions diff --git a/wqflask/wqflask/search_results.py b/wqflask/wqflask/search_results.py index d986a2e0..ae1cadd0 100644 --- a/wqflask/wqflask/search_results.py +++ b/wqflask/wqflask/search_results.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, print_function +from __future__ import absolute_import, print_function, division from wqflask import app @@ -16,6 +16,8 @@ import datetime from pprint import pformat as pf +from flask import Flask, g + # Instead of importing HT we're going to build a class below until we can eliminate it from htmlgen import HTMLgen2 as HT @@ -45,7 +47,7 @@ class SearchResultPage(templatePage): #logging_tree.printout() self.fd = fd templatePage.__init__(self, fd) - assert self.openMysql(), "Couldn't open MySQL" + #assert self.openMysql(), "Couldn't open MySQL" print("fd is:", pf(fd)) print("fd.dict is:", pf(fd['dataset'])) diff --git a/wqflask/wqflask/show_trait/SampleList.py b/wqflask/wqflask/show_trait/SampleList.py index d98a810a..1130fb60 100644 --- a/wqflask/wqflask/show_trait/SampleList.py +++ b/wqflask/wqflask/show_trait/SampleList.py @@ -4,7 +4,7 @@ from flask import Flask, g from base import webqtlCaseData from utility import webqtlUtil, Plot, Bunch -from base.webqtlTrait import GeneralTrait +from base.trait import GeneralTrait from pprint import pformat as pf |