darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-20 22:39:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rebecca Law
2017-11-30 11:20:29 +00:00
parent a5ceb4ba3c b1a4cc1043
commit 876d30e675
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.flake8
View File

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

2
manifest-api-staging.yml
View File

@@ -1,7 +1,7 @@
--- ---
inherit: manifest-api-base.yml 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: services:
- notify-aws - notify-aws
- notify-config - notify-config

2
tests/app/inbound_sms/test_rest.py
View File

@@ -4,7 +4,7 @@ import pytest
from freezegun import freeze_time from freezegun import freeze_time
from tests.app.db import ( 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,
) )