Merge branch 'main' into subclassing_bot

1 files changed, 61 insertions, 37 deletions

diff --git a/pyproject.toml b/pyproject.toml
index b350836e..0e7c2834 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,52 +6,76 @@ authors = ["Python Discord <[email protected]>"]
 license = "MIT"
 
 [tool.poetry.dependencies]
-python = "3.9.*"
-django = "~=3.1.14"
-django-environ = "~=0.4.5"
-django-filter = "~=21.1"
-djangorestframework = "~=3.12.0"
-psycopg2-binary = "~=2.8.0"
-django-simple-bulma = "~=2.4"
-whitenoise = "~=5.0"
-requests = "~=2.21"
-pyyaml = "~=5.1"
-gunicorn = "~=20.0.4"
-sentry-sdk = "~=0.19"
-markdown = "~=3.3.4"
-python-frontmatter = "~=1.0"
-django-prometheus = "~=2.1"
-django-distill = "~=2.9.0"
-
-[tool.poetry.dev-dependencies]
-coverage = "~=5.0"
-flake8 = "~=3.7"
-flake8-annotations = "~=2.0"
-flake8-bandit = "~=2.1"
-flake8-bugbear = "~=20.1"
-flake8-docstrings = "~=1.5"
-flake8-import-order = "~=0.18"
-flake8-string-format = "~=0.3"
-flake8-tidy-imports = "~=4.0"
-flake8-todo = "~=0.7"
-mccabe = "~=0.6.1"
-pep8-naming = "~=0.9"
-pre-commit = "~=2.1"
-pyfakefs = "~=4.5"
-coveralls = "~=2.1"
-taskipy = "~=1.7.0"
-python-dotenv = "~=0.17.1"
+python = "3.10.*"
+
+django = "4.2.1"
+django-distill = "3.1.3"
+django-environ = "0.10.0"
+django-filter = "23.2"
+django-prometheus = "2.3.1"
+django-simple-bulma = "2.5.0"
+djangorestframework = "3.14.0"
+gunicorn = "20.1.0"
+httpx = "0.24.0"
+markdown = "3.4.3"
+PyJWT = {version = "2.7.0", extras = ["crypto"]}
+pymdown-extensions = "9.11"
+python-frontmatter = "1.0.0"
+pyyaml = "6.0"
+sentry-sdk = "1.22.2"
+whitenoise = "6.4.0"
+psycopg = {extras = ["binary"], version = "^3.1.9"}
+
+[tool.poetry.group.dev.dependencies]
+python-dotenv = "1.0.0"
+taskipy = "1.10.4"
+ruff = "^0.0.265"
+
+[tool.poetry.group.lint.dependencies]
+pre-commit = "3.3.1"
+
+[tool.poetry.group.test.dependencies]
+coverage = "7.2.5"
 
 [build-system]
-requires = ["poetry-core>=1.0.0"]
+requires = ["poetry-core>=1.2.0"]
 build-backend = "poetry.core.masonry.api"
 
+[tool.ruff]
+target-version = "py310"
+extend-exclude = [".cache"]
+ignore = [
+    "ANN002", "ANN003", "ANN101", "ANN102", "ANN204", "ANN206", "ANN401",
+    "B904",
+    "C401", "C408",
+    "D100", "D104", "D105", "D107", "D203", "D212", "D214", "D215", "D301",
+    "D400", "D401", "D402", "D404", "D405", "D406", "D407", "D408", "D409", "D410", "D411", "D412", "D413", "D414", "D416", "D417",
+    "E731",
+    "DJ001", "DJ008",
+    "RET504",
+    "RUF005",
+    "S311",
+    "SIM102", "SIM108",
+]
+line-length = 120
+select = ["ANN", "B", "C4", "D", "DJ", "DTZ", "E", "F", "ISC", "INT", "N", "PGH", "PIE", "RET", "RSE", "RUF", "S", "SIM", "T20", "TID", "UP", "W"]
+
+[tool.ruff.per-file-ignores]
+"pydis_site/apps/**/migrations/*.py" = ["ALL"]
+"manage.py" = ["T201"]
+"pydis_site/apps/api/tests/base.py" = ["S106"]
+"pydis_site/apps/**/tests/test_*.py" = ["ANN", "D"]
+"static-builds/netlify_build.py" = ["T201"]
+"pydis_site/apps/api/tests/test_off_topic_channel_names.py" = ["RUF001"]
+"gunicorn.conf.py" = ["ANN", "D"]
+"pydis_site/apps/api/models/bot/off_topic_channel_name.py" = ["RUF001"]
+
 [tool.taskipy.tasks]
 start = "python manage.py run --debug"
 makemigrations = "python manage.py makemigrations"
 django_shell = "python manage.py shell"
 test = "coverage run manage.py test"
-coverage = "coverage run manage.py test --no-input; coverage report -m"
+coverage = "coverage run manage.py test --no-input && coverage report -m"
 report = "coverage report -m"
 lint = "pre-commit run --all-files"
 precommit = "pre-commit install"