Rebased master into this branch.

The cogs folder no longer exists, but the merge command was able to automagically find the correct files to merge into. Nomination reason is now optional.

1 files changed, 9 insertions, 7 deletions

diff --git a/Pipfile b/Pipfile
index 6fff2223e..3ff653749 100644
--- a/Pipfile
+++ b/Pipfile
@@ -7,24 +7,26 @@ name = "pypi"
 aio-pika = "~=6.1"
 aiodns = "~=2.0"
 aiohttp = "~=3.5"
+aioping = "~=0.3.1"
 aioredis = "~=1.3.1"
+"async-rediscache[fakeredis]" = "~=0.1.2"
 beautifulsoup4 = "~=4.9"
 colorama = {version = "~=0.4.3",sys_platform = "== 'win32'"}
 coloredlogs = "~=14.0"
 deepdiff = "~=4.0"
-discord.py = "~=1.4.0"
-fakeredis = "~=1.4"
+"discord.py" = {git = "https://github.com/Rapptz/discord.py.git", ref = "93f102ca907af6722ee03638766afd53dfe93a7f"}
 feedparser = "~=5.2"
 fuzzywuzzy = "~=0.17"
 lxml = "~=4.4"
-markdownify = "~=0.4"
+markdownify = "==0.5.3"
 more_itertools = "~=8.2"
 python-dateutil = "~=2.8"
 pyyaml = "~=5.1"
 requests = "~=2.22"
-sentry-sdk = "~=0.14"
+sentry-sdk = "~=0.19"
 sphinx = "~=2.2"
 statsd = "~=3.3"
+emoji = "~=0.6"
 
 [dev-packages]
 coverage = "~=5.0"
@@ -38,7 +40,7 @@ flake8-tidy-imports = "~=4.0"
 flake8-todo = "~=0.7"
 pep8-naming = "~=0.9"
 pre-commit = "~=2.1"
-unittest-xml-reporting = "~=3.0"
+coveralls = "~=2.1"
 
 [requires]
 python_version = "3.8"
@@ -47,8 +49,8 @@ python_version = "3.8"
 start = "python -m bot"
 lint = "pre-commit run --all-files"
 precommit = "pre-commit install"
-build = "docker build -t pythondiscord/bot:latest -f Dockerfile ."
-push = "docker push pythondiscord/bot:latest"
+build = "docker build -t ghcr.io/python-discord/bot:latest -f Dockerfile ."
+push = "docker push ghcr.io/python-discord/bot:latest"
 test = "coverage run -m unittest"
 html = "coverage html"
 report = "coverage report"