Merge branch 'main' into incident-archive-msg-improvements

1 files changed, 47 insertions, 43 deletions

diff --git a/pyproject.toml b/pyproject.toml
index 928435975..43eb799b6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,51 +6,55 @@ authors = ["Python Discord <[email protected]>"]
 license = "MIT"
 
 [tool.poetry.dependencies]
-python = "3.9.*"
-"discord.py" = {url = "https://github.com/Rapptz/discord.py/archive/45d498c1b76deaf3b394d17ccf56112fa691d160.zip"}
-aio-pika = "~=6.1"
-aiodns = "~=2.0"
-aiohttp = "~=3.7"
-aioredis = "~=1.3.1"
-arrow = "~=1.0.3"
-async-rediscache = { version = "~=0.1.2", extras = ["fakeredis"] }
-beautifulsoup4 = "~=4.9"
-colorama = { version = "~=0.4.3", markers = "sys_platform == 'win32'" }
-coloredlogs = "~=14.0"
-deepdiff = "~=4.0"
-emoji = "~=0.6"
-feedparser = "~=6.0.2"
-rapidfuzz = "~=1.4"
-lxml = "~=4.6"
-markdownify = "==0.6.1"
-more_itertools = "~=8.2"
-python-dateutil = "~=2.8"
-python-frontmatter = "~=1.0.0"
-pyyaml = "~=5.1"
-regex = "==2021.4.4"
-sentry-sdk = "~=1.3"
-statsd = "~=3.3"
-tldextract = "^3.1.2"
+python = "3.10.*"
+
+# See https://bot-core.pythondiscord.com/ for docs.
+bot-core = { url = "https://github.com/python-discord/bot-core/archive/refs/tags/v8.0.0.zip", extras = ["async-rediscache"] }
+redis = "4.3.4"
+fakeredis = { version = "1.8.2", extras = ["lua"] }
+
+aiohttp = "3.8.1"
+arrow = "1.2.2"
+beautifulsoup4 = "4.11.1"
+colorama = { version = "0.4.5", markers = "sys_platform == 'win32'" }
+coloredlogs = "15.0.1"
+deepdiff = "5.8.1"
+emoji = "2.0.0"
+feedparser = "6.0.10"
+rapidfuzz = "2.3.0"
+lxml = "4.9.1"
+
+# Must be kept on this version unless doc command output is fixed
+# See https://github.com/python-discord/bot/pull/2156
+markdownify = "0.6.1"
+
+more_itertools = "8.13.0"
+python-dateutil = "2.8.2"
+python-frontmatter = "1.0.0"
+pyyaml = "6.0"
+regex = "2022.7.25"
+sentry-sdk = "1.8.0"
+statsd = "3.3.0"
+tldextract = "3.3.1"
 
 [tool.poetry.dev-dependencies]
-coverage = "~=5.0"
-coveralls = "~=2.1"
-flake8 = "~=3.8"
-flake8-annotations = "~=2.0"
-flake8-bugbear = "~=20.1"
-flake8-docstrings = "~=1.4"
-flake8-string-format = "~=0.2"
-flake8-tidy-imports = "~=4.0"
-flake8-todo = "~=0.7"
-flake8-isort = "~=4.0"
-pep8-naming = "~=0.9"
-pre-commit = "~=2.1"
-taskipy = "~=1.7.0"
-pip-licenses = "~=3.5.3"
-python-dotenv = "~=0.17.1"
-pytest = "~=6.2.4"
-pytest-cov = "~=2.12.1"
-pytest-xdist = { version = "~=2.3.0", extras = ["psutil"] }
+coverage = "6.4.2"
+flake8 = "4.0.1"
+flake8-annotations = "2.9.0"
+flake8-bugbear = "22.7.1"
+flake8-docstrings = "1.6.0"
+flake8-string-format = "0.3.0"
+flake8-tidy-imports = "4.8.0"
+flake8-todo = "0.7"
+flake8-isort = "4.1.2.post0"
+pep8-naming = "0.13.1"
+pre-commit = "2.20.0"
+taskipy = "1.10.2"
+pip-licenses = "3.5.4"
+python-dotenv = "0.20.0"
+pytest = "7.1.2"
+pytest-cov = "3.0.0"
+pytest-xdist = "2.5.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]