chore: Bump dep reqs

.github/workflows/ci-cd.yml

@@ -1,11 +1,10 @@
----
 name: CI/CD
 
-on:  # yamllint disable-line rule:truthy
+on: # yamllint disable-line rule:truthy
   pull_request:
-    branches: [ "master", "main" ]
+    branches: ["master", "main"]
   push:
-    branches: [ "master", "main" ]
+    branches: ["master", "main"]
   release:
     types: [published]
 
@@ -16,10 +15,10 @@ jobs:
 
       - uses: actions/checkout@v1
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: "3.11"
 
       - name: Install dependencies
         run: |
@@ -40,8 +39,8 @@ jobs:
     strategy:
       max-parallel: 3
       matrix:
-        python-version: [3.9]
-        dj-version: [django40]
+        python-version: ["3.11"]
+        dj-version: [django50]
     steps:
 
       - uses: actions/checkout@v1
@@ -81,10 +80,10 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: "3.11"
 
       - name: Use Node.js 16
         uses: actions/setup-node@v3

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "wagtail-code-blog"
-version = "0.5.3"
+version = "0.5.4"
 license = "MIT"
 description = "A wagtail code blog"
 authors = ["Dani Hodovic <[email protected]>"]
@@ -13,56 +13,53 @@ homepage = "https://github.com/honeylogic-io/wagtail-code-blog"
 repository = "https://github.com/honeylogic-io/wagtail-code-blog"
 documentation = "https://github.com/honeylogic-io/wagtail-code-blog"
 include = ["wagtail_code_blog/static/wagtail_code_blog/output.css"]
-keywords = [
-  "wagtail",
-  "django",
-  "blog",
-  "cms"
-]
+keywords = ["wagtail", "django", "blog", "cms"]
 
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Environment :: Web Environment",
   "Framework :: Django",
   "Framework :: Django :: 4.0",
+  "Framework :: Django :: 5.0",
   "Intended Audience :: Developers",
   "License :: OSI Approved :: MIT License",
   "Operating System :: OS Independent",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
 ]
 
 [tool.poetry.dependencies]
 python = ">=3.9,<4.0"
-wagtail = "5.*"
-wagtail-metadata = "5.*"
-readtime = "^1.1.1"
-beautifulsoup4 = "^4"
+wagtail = "5.* || 6.* || 7.*"
+wagtail-metadata = "5.* || 6.*"
+readtime = "1.* || 2.* || 3.*"
+beautifulsoup4 = "4.*"
 django-json-ld = "^0.0.5 "
-django-model-utils = "^4.2.0"
-django = "4.*"
+django-model-utils = "4.*"
+django = "3.* || 4.* || 5.*"
 
 [tool.poetry.group.dev.dependencies]
 pudb = "2022.1.2"
-pytest = "^7.3.1"
-pytest-django = "^3.8.0"
+pytest = "^8.0.2"
+pytest-django = "^4.8.0"
 pytest-gitignore = "^1.3"
-pytest-cov = "^2.8.1"
-coverage = "^5.0.2"
-django-stubs = "^1.4.0"
-black = "^23.3.0"
-mypy = "^1.3.0"
-beautifulsoup4 = "^4.6.0"
-django-extensions = "^3.2.1"
-wagtail-foliage = "^0.1.1"
-isort = "^5.7.0"
-pylint = "^2.17.4"
-pylint-django = "^2.5.3"
-werkzeug = "^1.0.0"
-wagtail-markdown = "^0.9.0"
-tox = "^3.14.5"
-django-browser-reload = "^1.3.0"
+pytest-cov = "^4.1.0"
+coverage = "^7.4.3"
+django-stubs = "^4.2.7"
+black = "^24.2.0"
+mypy = "^1.8.0"
+beautifulsoup4 = "^4.12.3"
+django-extensions = "^3.2.3"
+isort = "^5.13.2"
+pylint = "^3.1.0"
+pylint-django = "^2.5.5"
+werkzeug = "^3.0.1"
+wagtail-markdown = "^0.10.0"
+tox = "^4.13.0"
+django-browser-reload = "^1.12.1"
 
 [tool.isort]
 skip_glob = "**/migrations/*.py,**/fixtures/*.py,infra/**/*.py"

tests/settings/base.py → tests/settings.py

@@ -68,3 +68,8 @@
 STATIC_URL = "/static/"
 SITE_ID = 1
 WAGTAIL_SITE_NAME = "My Example Site"
+WAGTAILADMIN_BASE_URL = "https://test.com"
+
+SECRET_KEY = "very-secret"
+
+DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3", "NAME": ":memory:"}}

tox.ini

@@ -6,7 +6,7 @@ envlist =
     black
     isort
     release
-    py{39,310}-django40
+    py{310,311}-django50
 
 [testenv]
 commands =
@@ -22,45 +22,43 @@ deps =
     wagtail-metadata
     wagtail-markdown
     wagtail-foliage
-    django40: Django==4.0
+    django50: Django==5.0
 setenv =
     PYTHONPATH = {toxinidir}:{env:PYTHONPATH:}
 
 [testenv:black]
+# Empty list to not install all deps from base testenv
 deps =
-    black: black==22.3.0
-commands = black --exclude '.*(migrations|.venv|.tox)' --check --diff .
+skip_install = true
+allowlist_externals = poetry
+commands_pre =
+    poetry install
+commands = black --exclude '.*(migrations|.tox|.venv)' --check --diff .
 
 [testenv:isort]
-deps = isort
+# Empty list to not install all deps from base testenv
+deps =
+skip_install = true
+allowlist_externals = poetry
+commands_pre =
+    poetry install
 commands = isort --check-only --diff .
 
 [testenv:pylint]
+# Empty list to not install all deps from base testenv
 deps =
-    django
-    django-json-ld
-    django-extensions
-    pylint
-    pylint-django
-    pytest
-    wagtail
-    wagtail-markdown
-    wagtail-metadata
-    wagtail-foliage
-    readtime
-commands = pylint wagtail_code_blog tests  --django-settings-module=tests.settings.test
+skip_install = true
+allowlist_externals = poetry
+commands_pre =
+    poetry install
+commands = pylint --django-settings-module=tests.settings wagtail_code_blog tests
 
 [testenv:mypy]
 deps =
-    mypy
-    django-stubs
-    wagtail
-    wagtail-markdown
-    wagtail-metadata
-    django-json-ld
-    django-extensions
-    readtime
-    django-model-utils
+skip_install = true
+allowlist_externals = poetry
+commands_pre =
+    poetry install
 commands = mypy .
 
 [testenv:release]

wagtail_code_blog/apps.py

@@ -1,3 +1,4 @@
+# pylint: disable=ungrouped-imports,wrong-import-position
 from django.apps import AppConfig