Merge branch 'main' into phishing_button

1 files changed, 37 insertions, 40 deletions

diff --git a/pyproject.toml b/pyproject.toml
index 9fce23896..6bc742246 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,40 +9,39 @@ license = "MIT"
 python = "3.11.*"
 
 # See https://bot-core.pythondiscord.com/ for docs.
-pydis_core = { version = "9.9.1", extras = ["async-rediscache"] }
+pydis_core = { version = "10.7.0", extras = ["async-rediscache"] }
 
-aiohttp = "3.8.4"
-arrow = "1.2.3"
-beautifulsoup4 = "4.12.2"
+aiohttp = "3.9.3"
+arrow = "1.3.0"
+beautifulsoup4 = "4.12.3"
 colorama = { version = "0.4.6", markers = "sys_platform == 'win32'" }
 coloredlogs = "15.0.1"
-deepdiff = "6.3.0"
-emoji = "2.6.0"
-feedparser = "6.0.10"
-lxml = "4.9.2"
+deepdiff = "6.7.1"
+emoji = "2.10.1"
+feedparser = "6.0.11"
+lxml = "5.1.0"
 markdownify = "0.11.6"
-more-itertools = "9.1.0"
-python-dateutil = "2.8.2"
-python-frontmatter = "1.0.0"
-pyyaml = "6.0"
-rapidfuzz = "3.1.1"
-regex = "2023.6.3"
-sentry-sdk = "1.26.0"
-tldextract = "3.4.4"
-pydantic = { version = "1.10.9", extras = ["dotenv"]}
+more-itertools = "10.2.0"
+python-dateutil = "2.9.0.post0"
+python-frontmatter = "1.1.0"
+rapidfuzz = "3.6.1"
+regex = "2023.12.25"
+sentry-sdk = "1.42.0"
+tldextract = "5.1.1"
+pydantic = "2.5.2"
+pydantic-settings = "2.2.1"
 
 [tool.poetry.dev-dependencies]
-coverage = "7.2.7"
-httpx = "0.24.1"
-isort = "5.12.0"
-pre-commit = "3.3.3"
-pip-licenses = "4.3.2"
-pytest = "7.4.0"
+coverage = "7.4.3"
+httpx = "0.27.0"
+pre-commit = "3.6.2"
+pip-licenses = "4.3.4"
+pytest = "8.1.1"
 pytest-cov = "4.1.0"
-pytest-subtests = "0.11.0"
-pytest-xdist = "3.3.1"
-ruff = "0.0.275"
-taskipy = "1.11.0"
+pytest-subtests = "0.12.1"
+pytest-xdist = "3.5.0"
+ruff = "0.3.2"
+taskipy = "1.12.2"
 
 
 [build-system]
@@ -61,24 +60,19 @@ retest = "pytest -n auto --lf"
 test-cov = "pytest -n auto --cov-report= --cov"
 html = "coverage html"
 report = "coverage report"
-isort = "isort ."
 
 [tool.coverage.run]
 branch = true
 source_pkgs = ["bot"]
 source = ["tests"]
 
-[tool.isort]
-multi_line_output = 6
-order_by_type = false
-case_sensitive = true
-combine_as_imports = true
-line_length = 120
-atomic = true
-
 [tool.ruff]
 target-version = "py311"
 extend-exclude = [".cache"]
+line-length = 120
+
+[tool.ruff.lint]
+select = ["ANN", "B", "C4", "D", "DTZ", "E", "F", "I", "ISC", "INT", "N", "PGH", "PIE", "Q", "RET", "RSE", "RUF", "S", "SIM", "T20", "TID", "UP", "W"]
 ignore = [
     "ANN002", "ANN003", "ANN101", "ANN102", "ANN204", "ANN206", "ANN401",
     "B904",
@@ -87,14 +81,17 @@ ignore = [
     "D400", "D401", "D402", "D404", "D405", "D406", "D407", "D408", "D409", "D410", "D411", "D412", "D413", "D414", "D416", "D417",
     "E731",
     "RET504",
-    "RUF005", "RUF012",
+    "RUF005", "RUF012", "RUF015",
     "S311",
     "SIM102", "SIM108",
 ]
-line-length = 120
-select = ["ANN", "B", "C4", "D", "DTZ", "E", "F", "ISC", "INT", "N", "PGH", "PIE", "Q", "RET", "RSE", "RUF", "S", "SIM", "T20", "TID", "UP", "W"]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.isort]
+order-by-type = false
+case-sensitive = true
+combine-as-imports = true
+
+[tool.ruff.lint.per-file-ignores]
 "tests/*" = ["ANN", "D"]
 
 [tool.pytest.ini_options]