Merge remote-tracking branch 'upstream/master'

2019-04-29 12:11:47 +02:00 · 2019-04-29 12:11:47 +02:00 · 5804441d38
commit 5804441d38
parent ded89416fb 4a286c4bc2
104 changed files with 26177 additions and 18562 deletions
--- a/tox.ini
+++ b/tox.ini
@ -1,14 +1,19 @@
-[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]
+setenv =
+    BOTO_CONFIG=/dev/null
+    AWS_SECRET_ACCESS_KEY=foobar_secret
+    AWS_ACCESS_KEY_ID=foobar_key
+    AWS_DEFAULT_REGION=us-east-1
+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