Merge branch 'master' of https://github.com/python-discord/bot into help-refactor

 Conflicts:

	bot/cogs/help.py

1 files changed, 5 insertions, 3 deletions

diff --git a/Pipfile b/Pipfile
index 82847b23f..7fd3efae8 100644
--- a/Pipfile
+++ b/Pipfile
@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-discord-py = "~=1.2"
+discord-py = "~=1.3.1"
 aiodns = "~=2.0"
 logmatic-python = "~=0.1"
 aiohttp = "~=3.5"
@@ -21,6 +21,7 @@ more_itertools = "~=7.2"
 urllib3 = ">=1.24.2,<1.25"
 
 [dev-packages]
+coverage = "~=4.5"
 flake8 = "~=3.7"
 flake8-annotations = "~=1.1"
 flake8-bugbear = "~=19.8"
@@ -31,9 +32,8 @@ flake8-tidy-imports = "~=2.0"
 flake8-todo = "~=0.7"
 pre-commit = "~=1.18"
 safety = "~=1.8"
+unittest-xml-reporting = "~=2.5"
 dodgy = "~=0.1"
-pytest = "~=5.1"
-pytest-cov = "~=2.7"
 
 [requires]
 python_version = "3.7"
@@ -44,3 +44,5 @@ lint = "python -m flake8"
 precommit = "pre-commit install"
 build = "docker build -t pythondiscord/bot:latest -f Dockerfile ."
 push = "docker push pythondiscord/bot:latest"
+test = "coverage run -m unittest"
+report = "coverage report"