diff options
| author | Alexander Kabui | 2021-04-12 16:53:48 +0300 |
|---|---|---|
| committer | Alexander Kabui | 2021-04-12 16:53:48 +0300 |
| commit | 35f5ac0335f44923184ffe0f0a3380a9cf1859ef (patch) | |
| tree | 8f1fcb15ace3574eb19bd0eafdc5b5bb0822ed09 /gn3/settings.py | |
| parent | 8ce82f5b6cccc015c38a728864c63c026fe6a3a0 (diff) | |
| parent | 31ac939f58bf7b6d353ced995ca395376203b25f (diff) | |
| download | genenetwork3-35f5ac0335f44923184ffe0f0a3380a9cf1859ef.tar.gz | |
fix merge conflict
Diffstat (limited to 'gn3/settings.py')
| -rw-r--r-- | gn3/settings.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gn3/settings.py b/gn3/settings.py index d9d4f90..478a041 100644 --- a/gn3/settings.py +++ b/gn3/settings.py @@ -12,7 +12,7 @@ REDIS_JOB_QUEUE = "GN3::job-queue" TMPDIR = os.environ.get("TMPDIR", tempfile.gettempdir()) # SQL confs -SQLALCHEMY_DATABASE_URI = "mysql://kabui:1234@localhost/test" +SQL_URI = os.environ.get("SQL_URI", "mysql://kabui:1234@localhost/db_webqtl") SECRET_KEY = "password" SQLALCHEMY_TRACK_MODIFICATIONS = False # gn2 results only used in fetching dataset info |