Merge branch 'master' of https://github.com/SharpBit/code-jam-1

SharpBit · SharpBit · commit d04759cecf02 · 2018-03-22T22:01:07.000-04:00
diff --git a/Pipfile b/Pipfile
@@ -6,6 +6,8 @@ name = "pypi"
 [packages]
 "72eb2aa" = {file = "https://github.com/Rapptz/discord.py/archive/rewrite.zip"}
 aiodns = "*"
+aiohttp = "<2.3.0,>=2.0.0"
+websockets = ">=4.0,<5.0"
 
 [dev-packages]
 "flake8" = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/tox.ini b/tox.ini
@@ -1,3 +1,4 @@
 [flake8]
 max-line-length=120
 application_import_names=bot
+exclude=.venv
