sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-11-15 01:05:42 +00:00
Code Issues Projects Releases Wiki Activity

Remove merge marker and readd TestingConfig class.

Browse Source
This commit is contained in:
Patrick Jentsch 2019-09-05 14:49:59 +02:00
parent 9ba7989fcc
commit e9da8befd4
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config.py
View File

@ -28,7 +28,6 @@ class Config:
class DevelopmentConfig(Config): class DevelopmentConfig(Config):
''' ### Flask ### ''' ''' ### Flask ### '''
DEBUG = True DEBUG = True
<<<<<<< HEAD
# SQLALCHEMY_DATABASE_URI = 'sqlite:///' + os.path.join(basedir, # SQLALCHEMY_DATABASE_URI = 'sqlite:///' + os.path.join(basedir,
# 'data_dev.sqlite') # 'data_dev.sqlite')
SQLALCHEMY_DATABASE_URI = \ SQLALCHEMY_DATABASE_URI = \
@ -39,8 +38,6 @@ class DevelopmentConfig(Config):
port=os.environ.get('POSTGRES_PORT'), port=os.environ.get('POSTGRES_PORT'),
db=os.environ.get('POSTGRES_DB_NAME')) db=os.environ.get('POSTGRES_DB_NAME'))
print(SQLALCHEMY_DATABASE_URI) print(SQLALCHEMY_DATABASE_URI)
=======
>>>>>>> e3db2ecd1e52b4993b91e1a1c3501c0fc775de1d
''' ### Flask-SQLAlchemy ### ''' ''' ### Flask-SQLAlchemy ### '''
SQLALCHEMY_DATABASE_URI = 'sqlite:///{}'.format( SQLALCHEMY_DATABASE_URI = 'sqlite:///{}'.format(
@ -49,6 +46,11 @@ class DevelopmentConfig(Config):
) )
class TestingConfig(Config):
''' ### Flask-SQLAlchemy ### '''
SQLALCHEMY_DATABASE_URI = 'sqlite://'
class ProductionConfig(Config): class ProductionConfig(Config):
''' ### Flask-SQLAlchemy ### ''' ''' ### Flask-SQLAlchemy ### '''
SQLALCHEMY_DATABASE_URI = os.environ.get('SQLALCHEMY_DATABASE_URI') SQLALCHEMY_DATABASE_URI = os.environ.get('SQLALCHEMY_DATABASE_URI')
@ -56,12 +58,7 @@ class ProductionConfig(Config):
config = { config = {
'development': DevelopmentConfig, 'development': DevelopmentConfig,
<<<<<<< HEAD
'testing': TestingConfig, 'testing': TestingConfig,
#'production': ProductionConfig,
=======
'production': ProductionConfig, 'production': ProductionConfig,
>>>>>>> e3db2ecd1e52b4993b91e1a1c3501c0fc775de1d
'default': DevelopmentConfig 'default': DevelopmentConfig
} }