Merge branch 'master' into #364-offensive-msg-autodeletion

1 files changed, 23 insertions, 20 deletions

diff --git a/Pipfile b/Pipfile
index 88aacf6a8..b42ca6d58 100644
--- a/Pipfile
+++ b/Pipfile
@@ -4,45 +4,48 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-discord-py = "~=1.3.1"
+aio-pika = "~=6.1"
 aiodns = "~=2.0"
 aiohttp = "~=3.5"
-sphinx = "~=2.2"
-markdownify = "~=0.4"
-lxml = "~=4.4"
-pyyaml = "~=5.1"
+aioredis = "~=1.3.1"
+beautifulsoup4 = "~=4.9"
+colorama = {version = "~=0.4.3",sys_platform = "== 'win32'"}
+coloredlogs = "~=14.0"
+deepdiff = "~=4.0"
+discord.py = "~=1.3.2"
+fakeredis = "~=1.4"
+feedparser = "~=5.2"
 fuzzywuzzy = "~=0.17"
-aio-pika = "~=6.1"
+lxml = "~=4.4"
+markdownify = "~=0.4"
+more_itertools = "~=8.2"
 python-dateutil = "~=2.8"
-deepdiff = "~=4.0"
+pyyaml = "~=5.1"
 requests = "~=2.22"
-more_itertools = "~=7.2"
-urllib3 = ">=1.24.2,<1.25"
 sentry-sdk = "~=0.14"
-coloredlogs = "~=14.0"
-colorama = {version = "~=0.4.3", sys_platform = "== 'win32'"}
+sphinx = "~=2.2"
+statsd = "~=3.3"
 
 [dev-packages]
-coverage = "~=4.5"
+coverage = "~=5.0"
 flake8 = "~=3.7"
 flake8-annotations = "~=2.0"
-flake8-bugbear = "~=19.8"
+flake8-bugbear = "~=20.1"
 flake8-docstrings = "~=1.4"
 flake8-import-order = "~=0.18"
 flake8-string-format = "~=0.2"
-flake8-tidy-imports = "~=2.0"
+flake8-tidy-imports = "~=4.0"
 flake8-todo = "~=0.7"
-pre-commit = "~=1.18"
-safety = "~=1.8"
-unittest-xml-reporting = "~=2.5"
-dodgy = "~=0.1"
+pep8-naming = "~=0.9"
+pre-commit = "~=2.1"
+unittest-xml-reporting = "~=3.0"
 
 [requires]
-python_version = "3.7"
+python_version = "3.8"
 
 [scripts]
 start = "python -m bot"
-lint = "python -m flake8"
+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"