Merge branch 'master' into sqlalchemy-utils-types

1daad3eb · PJ Janse van Rensburg · 3ddc092d · 43567732 · 1daad3eb · 1daad3eb
Commit 1daad3eb authored Oct 25, 2018 by PJ Janse van Rensburg
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

requirements-dev.txt requirements-dev.txt +1 -0

tox.ini tox.ini +1 -1

No files found.
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
+flake8
 Flask>=0.7
 Flask-SQLAlchemy>=0.15
 peewee

--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ skip_missing_interpreters = true
 [flake8]
 max_line_length = 120
-ignore = E402,E722
+ignore = E402,E722,W504
 [testenv]
 setenv =