From 23f0f48c804514ed80a981eb4ed1cfb6d4d2fdb1 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Wed, 14 Feb 2018 01:16:49 -0500 Subject: [PATCH] Use a special dev database for py3 branch --- config.py | 2 +- eos/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.py b/config.py index 339a19e0a..346e66818 100644 --- a/config.py +++ b/config.py @@ -111,7 +111,7 @@ def defPaths(customSavePath=None): # os.environ["SSL_CERT_FILE"] = os.path.join(pyfaPath, "cacert.pem") # The database where we store all the fits etc - saveDB = os.path.join(savePath, "saveddata.db") + saveDB = os.path.join(savePath, "saveddata-py3-dev.db") # The database where the static EVE data from the datadump is kept. # This is not the standard sqlite datadump but a modified version created by eos diff --git a/eos/config.py b/eos/config.py index 2c1dd7e71..6bc31eef8 100644 --- a/eos/config.py +++ b/eos/config.py @@ -18,7 +18,7 @@ if istravis is True or hasattr(sys, '_called_from_test'): # Running in Travis. Run saveddata database in memory. saveddata_connectionstring = 'sqlite:///:memory:' else: - saveddata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")) + saveddata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata-py3-db.db")) pyfalog.debug("Saveddata connection string: {0}", saveddata_connectionstring)