Merge branch 'master' into feature/manual_task_with_docs

This commit is contained in:
Dan Funk 2020-04-16 12:07:18 -04:00
commit 8aca33ab94
2 changed files with 4 additions and 3 deletions

2
Pipfile.lock generated
View File

@ -768,7 +768,7 @@
"spiffworkflow": { "spiffworkflow": {
"editable": true, "editable": true,
"git": "https://github.com/sartography/SpiffWorkflow.git", "git": "https://github.com/sartography/SpiffWorkflow.git",
"ref": "d46213c9c20859b42ff26c12f852fd32a58d3280" "ref": "d5f385f74ca2f755589aab2588333aa007d20852"
}, },
"sqlalchemy": { "sqlalchemy": {
"hashes": [ "hashes": [

View File

@ -5,8 +5,9 @@ basedir = os.path.abspath(os.path.dirname(__file__))
NAME = "CR Connect Workflow" NAME = "CR Connect Workflow"
CORS_ENABLED = False CORS_ENABLED = False
DEVELOPMENT = bool(environ.get('DEVELOPMENT', default="True")) DEVELOPMENT = environ.get('DEVELOPMENT', default="true") == "true"
TESTING = bool(environ.get('TESTING', default="False")) TESTING = environ.get('TESTING', default="false") == "true"
PRODUCTION = (environ.get('PRODUCTION', default="false") == "true") or (not DEVELOPMENT and not TESTING)
DB_HOST = environ.get('DB_HOST', default="localhost") DB_HOST = environ.get('DB_HOST', default="localhost")
DB_PORT = environ.get('DB_PORT', default="5432") DB_PORT = environ.get('DB_PORT', default="5432")