merge master into improve-health-2

2016-12-10 13:10:19 -05:00
parent 37c86350f2 1b9432824b
commit 5778cb4b51
4 changed files with 52 additions and 6 deletions
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,6 +8,5 @@ tests = tests

 [flake8]
 ignore=E501,F401,F403,F405,I201
-exclude=build,dist,docs,venv,venv26,venv3,.tox,.eggs,tests
-max-complexity=42
-application-import-names=mongoengine,tests
+exclude=build,dist,docs,venv,venv3,.tox,.eggs,tests
+max-complexity=45