Merge branch 'master' into stop-populating-mapping-tables

This commit is contained in:
Rebecca Law
2017-11-30 11:20:29 +00:00
3 changed files with 3 additions and 3 deletions

View File

@@ -1,7 +1,7 @@
[flake8]
# Rule definitions: http://flake8.pycqa.org/en/latest/user/error-codes.html
# W503: line break before binary operator
exclude = venv*,__pycache__,node_modules,cache,migrations
exclude = venv*,__pycache__,node_modules,cache,migrations,build
ignore = W503
max-complexity = 14
max-line-length = 120

View File

@@ -1,7 +1,7 @@
---
inherit: manifest-api-base.yml
command: scripts/run_app_paas.sh gunicorn -c /home/vcap/app/gunicorn_config.py --error-logfile /home/vcap/logs/gunicorn_error.log -w 10 -b 0.0.0.0:$PORT application
command: scripts/run_app_paas.sh gunicorn -c /home/vcap/app/gunicorn_config.py --error-logfile /home/vcap/logs/gunicorn_error.log -w 6 -b 0.0.0.0:$PORT application
services:
- notify-aws
- notify-config

View File

@@ -4,7 +4,7 @@ import pytest
from freezegun import freeze_time
from tests.app.db import (
create_inbound_sms, create_service, create_service_with_inbound_number
create_inbound_sms, create_service, create_service_with_inbound_number,
)