merge

2018-12-21 12:28:56 +01:00 · 2018-12-21 12:28:56 +01:00 · e51d1bfade
commit e51d1bfade
parent 181b5539f6
172 changed files with 49629 additions and 49629 deletions
--- a/tox.ini
+++ b/tox.ini
@ -1,14 +1,14 @@
-[tox]
-envlist = py27, py36
-
-[testenv]
-deps =
-    -r{toxinidir}/requirements.txt
-    -r{toxinidir}/requirements-dev.txt
-commands =
-    {envpython} setup.py test
-    nosetests {posargs}
-
-[flake8]
-ignore = E128,E501
-exclude = moto/packages,dist
+[tox]
+envlist = py27, py36
+
+[testenv]
+deps =
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/requirements-dev.txt
+commands =
+    {envpython} setup.py test
+    nosetests {posargs}
+
+[flake8]
+ignore = E128,E501
+exclude = moto/packages,dist