updated config

main
Michael Herman 2015-04-16 12:36:10 -06:00
parent 32980dafba
commit b21e31dadd
12 changed files with 65 additions and 59 deletions

4
.gitignore vendored
View File

@ -1,8 +1,10 @@
env
temp
tmp
__pycahe__
*.pyc
*.sqlite
*.coverage
.DS_Store
.DS_Store
config.py

View File

@ -8,16 +8,16 @@ Flask starter project...
### Set Environment Variables
Update the configuration setting files in "/project/config" and then run:
Rename *config_sample.py* to *config.py*, update the config settings, and then run:
```sh
$ export APP_SETTINGS="project.config.development_config"
$ export APP_SETTINGS="config.DevelopmentConfig"
```
or
```sh
$ export APP_SETTINGS="project.config.production_config"
$ export APP_SETTINGS="config.ProductionConfig"
```
### Create DB

41
config_sample.py Normal file
View File

@ -0,0 +1,41 @@
# config.py
import os
basedir = os.path.abspath(os.path.dirname(__file__))
class BaseConfig(object):
"""Base configuration."""
SECRET_KEY = 'my_precious'
DEBUG = False
BCRYPT_LOG_ROUNDS = 13
WTF_CSRF_ENABLED = True
DEBUG_TB_ENABLED = False
DEBUG_TB_INTERCEPT_REDIRECTS = False
class DevelopmentConfig(BaseConfig):
"""Development configuration."""
DEBUG = True
BCRYPT_LOG_ROUNDS = 1
WTF_CSRF_ENABLED = False
SQLALCHEMY_DATABASE_URI = 'sqlite:///' + os.path.join(basedir, 'dev.sqlite')
DEBUG_TB_ENABLED = True
class TestingConfig(BaseConfig):
"""Testing configuration."""
DEBUG = True
TESTING = True
BCRYPT_LOG_ROUNDS = 1
WTF_CSRF_ENABLED = False
SQLALCHEMY_DATABASE_URI = 'sqlite:///'
DEBUG_TB_ENABLED = False
class ProductionConfig(BaseConfig):
"""Production configuration."""
SECRET_KEY = 'my_precious'
DEBUG = False
SQLALCHEMY_DATABASE_URI = 'postgresql://localhost/example'
DEBUG_TB_ENABLED = False

View File

@ -39,7 +39,7 @@ def cov():
unittest.TextTestRunner(verbosity=2).run(tests)
cov.stop()
cov.save()
print 'Coverage Summary:'
print('Coverage Summary:')
cov.report()
basedir = os.path.abspath(os.path.dirname(__file__))
covdir = os.path.join(basedir, 'tmp/coverage')

View File

@ -1,13 +1,13 @@
"""empty message
Revision ID: 524796b5773a
Revision ID: 1e082cd44f3e
Revises: None
Create Date: 2015-01-21 09:26:16.334639
Create Date: 2015-04-16 12:31:28.726610
"""
# revision identifiers, used by Alembic.
revision = '524796b5773a'
revision = '1e082cd44f3e'
down_revision = None
from alembic import op

View File

@ -1 +0,0 @@
# project/config/__init__.py

View File

@ -1,13 +0,0 @@
# project/config/development_config.py
import os
basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
SECRET_KEY = 'my_precious'
DEBUG = True
BCRYPT_LOG_ROUNDS = 13
WTF_CSRF_ENABLED = False
DEBUG_TB_ENABLED = True
DEBUG_TB_INTERCEPT_REDIRECTS = False
SQLALCHEMY_DATABASE_URI = 'sqlite:///' + os.path.join(basedir, 'dev.sqlite')

View File

@ -1,10 +0,0 @@
# project/config/production_config.py
SECRET_KEY = 'my_precious'
DEBUG = False
BCRYPT_LOG_ROUNDS = 13
WTF_CSRF_ENABLED = True
DEBUG_TB_ENABLED = False
DEBUG_TB_INTERCEPT_REDIRECTS = False
SQLALCHEMY_DATABASE_URI = 'postgresql://localhost/example'

View File

@ -1,11 +0,0 @@
# project/config/test_config.py
TESTING = True
SECRET_KEY = 'my_precious'
DEBUG = True
BCRYPT_LOG_ROUNDS = 1
WTF_CSRF_ENABLED = False
DEBUG_TB_ENABLED = False
DEBUG_TB_INTERCEPT_REDIRECTS = False
SQLALCHEMY_DATABASE_URI = 'sqlite://'

View File

@ -1,22 +1,20 @@
Flask==0.10.1
Flask-Bcrypt==0.6.0
Flask-Bootstrap==3.3.0.1
Flask-DebugToolbar==0.9.0
Flask-Bcrypt==0.6.2
Flask-Bootstrap==3.3.2.1
Flask-DebugToolbar==0.9.2
Flask-Login==0.2.11
Flask-Migrate==1.2.0
Flask-Migrate==1.3.1
Flask-SQLAlchemy==2.0
Flask-Script==2.0.5
Flask-Testing==0.4.2
Flask-WTF==0.10.3
Flask-WTF==0.11
Jinja2==2.7.3
Mako==1.0.0
Mako==1.0.1
MarkupSafe==0.23
SQLAlchemy==0.9.8
SQLAlchemy==0.9.9
WTForms==2.0.2
Werkzeug==0.9.6
alembic==0.7.4
Werkzeug==0.10.4
alembic==0.7.5.post2
blinker==1.3
coverage==4.0a2
itsdangerous==0.24
py-bcrypt==0.4
wsgiref==0.1.2
python-bcrypt==0.3.1

View File

@ -10,7 +10,7 @@ from project.models import User
class BaseTestCase(TestCase):
def create_app(self):
app.config.from_object('project.config.test_config')
app.config.from_object('config.TestingConfig')
return app
def setUp(self):

View File

@ -12,7 +12,7 @@ from project import app
class TestDevelopmentConfig(TestCase):
def create_app(self):
app.config.from_object('project.config.development_config')
app.config.from_object('config.DevelopmentConfig')
return app
def test_app_is_development(self):
@ -26,7 +26,7 @@ class TestDevelopmentConfig(TestCase):
class TestTestingConfig(TestCase):
def create_app(self):
app.config.from_object('project.config.test_config')
app.config.from_object('config.TestingConfig')
return app
def test_app_is_testing(self):
@ -39,7 +39,7 @@ class TestTestingConfig(TestCase):
class TestProductionConfig(TestCase):
def create_app(self):
app.config.from_object('project.config.production_config')
app.config.from_object('config.ProductionConfig')
return app
def test_app_is_production(self):