From e9da8befd4b8175c2091ffd1b550b4ccc9aecd62 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Thu, 5 Sep 2019 14:49:59 +0200
Subject: [PATCH] Remove merge marker and readd TestingConfig class.
---
config.py | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/config.py b/config.py
index f80e8f27..fb7ff521 100644
--- a/config.py
+++ b/config.py
@@ -28,7 +28,6 @@ class Config:
class DevelopmentConfig(Config):
''' ### Flask ### '''
DEBUG = True
-<<<<<<< HEAD
# SQLALCHEMY_DATABASE_URI = 'sqlite:///' + os.path.join(basedir,
# 'data_dev.sqlite')
SQLALCHEMY_DATABASE_URI = \
@@ -39,8 +38,6 @@ class DevelopmentConfig(Config):
port=os.environ.get('POSTGRES_PORT'),
db=os.environ.get('POSTGRES_DB_NAME'))
print(SQLALCHEMY_DATABASE_URI)
-=======
->>>>>>> e3db2ecd1e52b4993b91e1a1c3501c0fc775de1d
''' ### Flask-SQLAlchemy ### '''
SQLALCHEMY_DATABASE_URI = 'sqlite:///{}'.format(
@@ -49,6 +46,11 @@ class DevelopmentConfig(Config):
)
+class TestingConfig(Config):
+ ''' ### Flask-SQLAlchemy ### '''
+ SQLALCHEMY_DATABASE_URI = 'sqlite://'
+
+
class ProductionConfig(Config):
''' ### Flask-SQLAlchemy ### '''
SQLALCHEMY_DATABASE_URI = os.environ.get('SQLALCHEMY_DATABASE_URI')
@@ -56,12 +58,7 @@ class ProductionConfig(Config):
config = {
'development': DevelopmentConfig,
-<<<<<<< HEAD
'testing': TestingConfig,
- #'production': ProductionConfig,
-
-=======
'production': ProductionConfig,
->>>>>>> e3db2ecd1e52b4993b91e1a1c3501c0fc775de1d
'default': DevelopmentConfig
}
--
GitLab