From c1dc859a0fd511e5a4998bb2e0c69149e1df1a13 Mon Sep 17 00:00:00 2001 From: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> Date: Sat, 30 Mar 2024 10:29:06 +0100 Subject: [PATCH 1/2] Changes to be able to upgrade to wagtail 5. (#360) --- accounts/models.py | 2 +- home/blocks.py | 5 ++--- home/models/blog.py | 10 +++++----- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/accounts/models.py b/accounts/models.py index 317c998f..c537b4ef 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -9,7 +9,7 @@ from django.db.models.signals import post_save from django.dispatch import receiver from django.urls import reverse -from wagtail.core.models import Orderable +from wagtail.models import Orderable from accounts.fields import DefaultOneToOneField diff --git a/home/blocks.py b/home/blocks.py index 964e7cb4..9fe4af24 100644 --- a/home/blocks.py +++ b/home/blocks.py @@ -1,8 +1,7 @@ from __future__ import annotations -from wagtail.blocks import StreamBlock +from wagtail import blocks from wagtail.contrib.table_block.blocks import TableBlock -from wagtail.core import blocks from wagtail.images.blocks import ImageChooserBlock CODE_LANGUAGE_OPTIONS = ( @@ -232,7 +231,7 @@ class Meta: template = "blocks/rich_text.html" -class BaseStreamBlock(StreamBlock): +class BaseStreamBlock(blocks.StreamBlock): heading = HeadingBlock(label="Heading", icon="h1") rich_text = RichTextBlock() list = ListBlock(label="List", icon="list-ol") diff --git a/home/models/blog.py b/home/models/blog.py index 1cfd04f8..8e9f2df1 100644 --- a/home/models/blog.py +++ b/home/models/blog.py @@ -6,14 +6,14 @@ from modelcluster.fields import ParentalKey from puput.abstracts import EntryAbstract from taggit.models import TaggedItemBase -from wagtail.admin.edit_handlers import FieldPanel -from wagtail.admin.edit_handlers import MultiFieldPanel +from wagtail import blocks +from wagtail.admin.panels import FieldPanel from wagtail.admin.panels import InlinePanel +from wagtail.admin.panels import MultiFieldPanel from wagtail.admin.panels import PageChooserPanel from wagtail.contrib.table_block.blocks import TableBlock -from wagtail.core import blocks -from wagtail.core.fields import RichTextField -from wagtail.core.fields import StreamField +from wagtail.fields import RichTextField +from wagtail.fields import StreamField from wagtail.images.blocks import ImageChooserBlock from wagtail.models import Page From be5db368ef5f19041f29e50786b004aa28662196 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 Mar 2024 10:44:31 +0100 Subject: [PATCH 2/2] Bump the dependencies group in /requirements with 14 updates (#346) Bumps the dependencies group in /requirements with 14 updates: | Package | From | To | | --- | --- | --- | | [django-anymail](https://github.com/anymail/django-anymail) | `9.0` | `10.3` | | [django-debug-toolbar](https://github.com/jazzband/django-debug-toolbar) | `4.2.0` | `4.3.0` | | [django-tailwind](https://github.com/timonweb/django-tailwind) | `3.6.0` | `3.8.0` | | [python-dotenv](https://github.com/theskumar/python-dotenv) | `0.21.1` | `1.0.1` | | [typing-extensions](https://github.com/python/typing_extensions) | `4.6.3` | `4.10.0` | | [urllib3](https://github.com/urllib3/urllib3) | `1.26.18` | `2.2.1` | | [wagtail](https://github.com/wagtail/wagtail) | `4.1.9` | `5.0.5` | | [whitenoise](https://github.com/evansd/whitenoise) | `6.3.0` | `6.6.0` | | [pip-tools](https://github.com/jazzband/pip-tools) | `7.3.0` | `7.4.1` | | [playwright](https://github.com/Microsoft/playwright-python) | `1.40.0` | `1.42.0` | | [pre-commit](https://github.com/pre-commit/pre-commit) | `3.6.0` | `3.7.0` | | [pytest-django](https://github.com/pytest-dev/pytest-django) | `4.7.0` | `4.8.0` | | [pytest-mock](https://github.com/pytest-dev/pytest-mock) | `3.12.0` | `3.14.0` | | [pytest-playwright](https://github.com/microsoft/playwright-pytest) | `0.4.3` | `0.4.4` | Updates `django-anymail` from 9.0 to 10.3 - [Release notes](https://github.com/anymail/django-anymail/releases) - [Changelog](https://github.com/anymail/django-anymail/blob/main/CHANGELOG.rst) - [Commits](https://github.com/anymail/django-anymail/compare/v9.0...v10.3) Updates `django-debug-toolbar` from 4.2.0 to 4.3.0 - [Release notes](https://github.com/jazzband/django-debug-toolbar/releases) - [Changelog](https://github.com/jazzband/django-debug-toolbar/blob/main/docs/changes.rst) - [Commits](https://github.com/jazzband/django-debug-toolbar/compare/4.2...4.3) Updates `django-tailwind` from 3.6.0 to 3.8.0 - [Changelog](https://github.com/timonweb/django-tailwind/blob/master/CHANGELOG.md) - [Commits](https://github.com/timonweb/django-tailwind/compare/3.6.0...3.8.0) Updates `python-dotenv` from 0.21.1 to 1.0.1 - [Release notes](https://github.com/theskumar/python-dotenv/releases) - [Changelog](https://github.com/theskumar/python-dotenv/blob/main/CHANGELOG.md) - [Commits](https://github.com/theskumar/python-dotenv/compare/v0.21.1...v1.0.1) Updates `typing-extensions` from 4.6.3 to 4.10.0 - [Release notes](https://github.com/python/typing_extensions/releases) - [Changelog](https://github.com/python/typing_extensions/blob/main/CHANGELOG.md) - [Commits](https://github.com/python/typing_extensions/compare/4.6.3...4.10.0) Updates `urllib3` from 1.26.18 to 2.2.1 - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/1.26.18...2.2.1) Updates `wagtail` from 4.1.9 to 5.0.5 - [Release notes](https://github.com/wagtail/wagtail/releases) - [Changelog](https://github.com/wagtail/wagtail/blob/main/CHANGELOG.txt) - [Commits](https://github.com/wagtail/wagtail/compare/v4.1.9...v5.0.5) Updates `whitenoise` from 6.3.0 to 6.6.0 - [Changelog](https://github.com/evansd/whitenoise/blob/main/docs/changelog.rst) - [Commits](https://github.com/evansd/whitenoise/compare/6.3.0...6.6.0) Updates `pip-tools` from 7.3.0 to 7.4.1 - [Release notes](https://github.com/jazzband/pip-tools/releases) - [Changelog](https://github.com/jazzband/pip-tools/blob/main/CHANGELOG.md) - [Commits](https://github.com/jazzband/pip-tools/compare/7.3.0...7.4.1) Updates `playwright` from 1.40.0 to 1.42.0 - [Release notes](https://github.com/Microsoft/playwright-python/releases) - [Commits](https://github.com/Microsoft/playwright-python/compare/v1.40.0...v1.42.0) Updates `pre-commit` from 3.6.0 to 3.7.0 - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v3.6.0...v3.7.0) Updates `pytest-django` from 4.7.0 to 4.8.0 - [Release notes](https://github.com/pytest-dev/pytest-django/releases) - [Changelog](https://github.com/pytest-dev/pytest-django/blob/master/docs/changelog.rst) - [Commits](https://github.com/pytest-dev/pytest-django/compare/v4.7.0...v4.8.0) Updates `pytest-mock` from 3.12.0 to 3.14.0 - [Release notes](https://github.com/pytest-dev/pytest-mock/releases) - [Changelog](https://github.com/pytest-dev/pytest-mock/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-mock/compare/v3.12.0...v3.14.0) Updates `pytest-playwright` from 0.4.3 to 0.4.4 - [Release notes](https://github.com/microsoft/playwright-pytest/releases) - [Commits](https://github.com/microsoft/playwright-pytest/compare/v0.4.3...v0.4.4) --- updated-dependencies: - dependency-name: django-anymail dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: django-debug-toolbar dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: django-tailwind dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: python-dotenv dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: typing-extensions dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: urllib3 dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: wagtail dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: whitenoise dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: pip-tools dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: playwright dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: pre-commit dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: pytest-django dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: pytest-mock dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: pytest-playwright dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/requirements-dev.txt | 321 +++++++++++++++-------------- requirements/requirements-test.txt | 165 +++++++-------- requirements/requirements.in | 2 +- requirements/requirements.txt | 55 ++--- 4 files changed, 274 insertions(+), 269 deletions(-) diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt index 7702d17a..68f021df 100644 --- a/requirements/requirements-dev.txt +++ b/requirements/requirements-dev.txt @@ -6,81 +6,81 @@ # anyascii==0.3.2 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail anyio==4.2.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # azure-core asgiref==3.7.2 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # django # django-browser-reload azure-core==1.29.6 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # azure-storage-blob azure-storage-blob==12.19.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt beautifulsoup4==4.11.2 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail bleach==4.1.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail-markdown build==1.0.3 # via pip-tools certifi==2023.11.17 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # requests # sentry-sdk cffi==1.16.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # cryptography cfgv==3.4.0 # via pre-commit charset-normalizer==3.3.2 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # requests click==8.1.7 # via pip-tools cryptography==41.0.7 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # azure-storage-blob defusedxml==0.7.1 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # willow distlib==0.3.8 # via virtualenv dj-database-url==2.1.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt django==4.1.13 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # dj-database-url # django-anymail # django-browser-reload @@ -99,231 +99,233 @@ django==4.1.13 # djangorestframework # puput # wagtail -django-anymail==9.0 +django-anymail==10.3 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt django-browser-reload==1.12.1 # via django-tailwind django-colorful==1.3 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # puput -django-debug-toolbar==4.2.0 +django-debug-toolbar==4.3.0 # via - # -r requirements/requirements-dev.in - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-dev.in + # -r requirements-test.txt + # -r requirements.txt django-el-pagination==4.0.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # puput django-extensions==3.2.3 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt django-filter==22.1 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail django-modelcluster==6.2.1 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail django-permissionedforms==0.1 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail django-recaptcha==4.0.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt django-social-share==2.3.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # puput django-storages==1.13.2 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt django-taggit==3.1.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # puput # wagtail -django-tailwind==3.6.0 +django-tailwind==3.8.0 # via - # -r requirements/requirements-dev.in - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-dev.in + # -r requirements-test.txt + # -r requirements.txt django-treebeard==4.7 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail django-widget-tweaks==1.5.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt djangorestframework==3.14.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail draftjs-exporter==2.1.7 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail et-xmlfile==1.1.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # openpyxl factory-boy==3.3.0 - # via -r requirements/requirements-test.txt + # via -r requirements-test.txt faker==23.2.1 # via - # -r requirements/requirements-test.txt + # -r requirements-test.txt # factory-boy filelock==3.13.1 # via virtualenv filetype==1.2.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # willow freezegun==1.4.0 - # via -r requirements/requirements-test.txt -greenlet==3.0.1 + # via -r requirements-test.txt +greenlet==3.0.3 # via - # -r requirements/requirements-test.txt + # -r requirements-test.txt # playwright html5lib==1.1 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail identify==2.5.33 # via pre-commit idna==3.6 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # anyio # requests iniconfig==2.0.0 # via - # -r requirements/requirements-test.txt + # -r requirements-test.txt # pytest isodate==0.6.1 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # azure-storage-blob l18n==2021.3 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail markdown==3.5.2 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail-markdown nodeenv==1.8.0 # via pre-commit openpyxl==3.1.2 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail packaging==23.2 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # bleach # build # pytest pillow==10.2.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail -pip-tools==7.3.0 - # via -r requirements/requirements-dev.in +pip-tools==7.4.1 + # via -r requirements-dev.in platformdirs==4.1.0 # via virtualenv -playwright==1.40.0 +playwright==1.42.0 # via - # -r requirements/requirements-test.txt + # -r requirements-test.txt # pytest-playwright pluggy==1.3.0 # via - # -r requirements/requirements-test.txt + # -r requirements-test.txt # pytest -pre-commit==3.6.0 - # via -r requirements/requirements-dev.in +pre-commit==3.7.0 + # via -r requirements-dev.in psycopg2-binary==2.9.9 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt puput==2.0.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt pycparser==2.21 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # cffi pyee==11.0.1 # via - # -r requirements/requirements-test.txt + # -r requirements-test.txt # playwright pyproject-hooks==1.0.0 - # via build + # via + # build + # pip-tools pytest==7.4.4 # via - # -r requirements/requirements-test.txt + # -r requirements-test.txt # pytest-base-url # pytest-django # pytest-mock # pytest-playwright pytest-base-url==2.0.0 # via - # -r requirements/requirements-test.txt + # -r requirements-test.txt # pytest-playwright -pytest-django==4.7.0 - # via -r requirements/requirements-test.txt -pytest-mock==3.12.0 - # via -r requirements/requirements-test.txt -pytest-playwright==0.4.3 - # via -r requirements/requirements-test.txt +pytest-django==4.8.0 + # via -r requirements-test.txt +pytest-mock==3.14.0 + # via -r requirements-test.txt +pytest-playwright==0.4.4 + # via -r requirements-test.txt python-dateutil==2.8.2 # via - # -r requirements/requirements-test.txt + # -r requirements-test.txt # faker # freezegun -python-dotenv==0.21.1 +python-dotenv==1.0.1 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt python-slugify==8.0.1 # via - # -r requirements/requirements-test.txt + # -r requirements-test.txt # pytest-playwright pytz==2023.3.post1 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # django-modelcluster # djangorestframework # l18n @@ -331,20 +333,20 @@ pyyaml==6.0.1 # via pre-commit requests==2.31.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # azure-core # django-anymail # pytest-base-url # wagtail sentry-sdk==1.40.4 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt six==1.16.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # azure-core # bleach # html5lib @@ -353,78 +355,79 @@ six==1.16.0 # python-dateutil sniffio==1.3.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # anyio soupsieve==2.5 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # beautifulsoup4 sqlparse==0.4.4 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # django # django-debug-toolbar supervisor==4.2.5 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt telepath==0.3.1 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail text-unidecode==1.3 # via - # -r requirements/requirements-test.txt + # -r requirements-test.txt # python-slugify -typing-extensions==4.6.3 +typing-extensions==4.10.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # azure-core # azure-storage-blob # dj-database-url # pyee unittest-parametrize==1.4.0 - # via -r requirements/requirements-test.txt -urllib3==1.26.18 + # via -r requirements-test.txt +urllib3==2.2.1 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt + # django-anymail # requests # sentry-sdk virtualenv==20.25.0 # via pre-commit -wagtail==4.1.9 +wagtail==5.0.5 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # puput # wagtail-markdown wagtail-markdown==0.11.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # puput webencodings==0.5.1 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # bleach # html5lib wheel==0.42.0 # via pip-tools -whitenoise==6.3.0 +whitenoise==6.6.0 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt willow==1.6.3 # via - # -r requirements/requirements-test.txt - # -r requirements/requirements.txt + # -r requirements-test.txt + # -r requirements.txt # wagtail # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/requirements-test.txt b/requirements/requirements-test.txt index 240ddfff..7c859948 100644 --- a/requirements/requirements-test.txt +++ b/requirements/requirements-test.txt @@ -6,56 +6,56 @@ # anyascii==0.3.2 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail anyio==4.2.0 # via - # -r requirements/requirements.txt + # -r requirements.txt # azure-core asgiref==3.7.2 # via - # -r requirements/requirements.txt + # -r requirements.txt # django azure-core==1.29.6 # via - # -r requirements/requirements.txt + # -r requirements.txt # azure-storage-blob azure-storage-blob==12.19.0 - # via -r requirements/requirements.txt + # via -r requirements.txt beautifulsoup4==4.11.2 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail bleach==4.1.0 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail-markdown certifi==2023.11.17 # via - # -r requirements/requirements.txt + # -r requirements.txt # requests # sentry-sdk cffi==1.16.0 # via - # -r requirements/requirements.txt + # -r requirements.txt # cryptography charset-normalizer==3.3.2 # via - # -r requirements/requirements.txt + # -r requirements.txt # requests cryptography==41.0.7 # via - # -r requirements/requirements.txt + # -r requirements.txt # azure-storage-blob defusedxml==0.7.1 # via - # -r requirements/requirements.txt + # -r requirements.txt # willow dj-database-url==2.1.0 - # via -r requirements/requirements.txt + # via -r requirements.txt django==4.1.13 # via - # -r requirements/requirements.txt + # -r requirements.txt # dj-database-url # django-anymail # django-colorful @@ -73,170 +73,170 @@ django==4.1.13 # djangorestframework # puput # wagtail -django-anymail==9.0 - # via -r requirements/requirements.txt +django-anymail==10.3 + # via -r requirements.txt django-colorful==1.3 # via - # -r requirements/requirements.txt + # -r requirements.txt # puput -django-debug-toolbar==4.2.0 - # via -r requirements/requirements.txt +django-debug-toolbar==4.3.0 + # via -r requirements.txt django-el-pagination==4.0.0 # via - # -r requirements/requirements.txt + # -r requirements.txt # puput django-extensions==3.2.3 - # via -r requirements/requirements.txt + # via -r requirements.txt django-filter==22.1 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail django-modelcluster==6.2.1 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail django-permissionedforms==0.1 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail django-recaptcha==4.0.0 - # via -r requirements/requirements.txt + # via -r requirements.txt django-social-share==2.3.0 # via - # -r requirements/requirements.txt + # -r requirements.txt # puput django-storages==1.13.2 - # via -r requirements/requirements.txt + # via -r requirements.txt django-taggit==3.1.0 # via - # -r requirements/requirements.txt + # -r requirements.txt # puput # wagtail -django-tailwind==3.6.0 - # via -r requirements/requirements.txt +django-tailwind==3.8.0 + # via -r requirements.txt django-treebeard==4.7 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail django-widget-tweaks==1.5.0 - # via -r requirements/requirements.txt + # via -r requirements.txt djangorestframework==3.14.0 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail draftjs-exporter==2.1.7 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail et-xmlfile==1.1.0 # via - # -r requirements/requirements.txt + # -r requirements.txt # openpyxl factory-boy==3.3.0 - # via -r requirements/requirements-test.in + # via -r requirements-test.in faker==23.2.1 # via factory-boy filetype==1.2.0 # via - # -r requirements/requirements.txt + # -r requirements.txt # willow freezegun==1.4.0 - # via -r requirements/requirements-test.in -greenlet==3.0.1 + # via -r requirements-test.in +greenlet==3.0.3 # via playwright html5lib==1.1 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail idna==3.6 # via - # -r requirements/requirements.txt + # -r requirements.txt # anyio # requests iniconfig==2.0.0 # via pytest isodate==0.6.1 # via - # -r requirements/requirements.txt + # -r requirements.txt # azure-storage-blob l18n==2021.3 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail markdown==3.5.2 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail-markdown openpyxl==3.1.2 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail packaging==23.2 # via - # -r requirements/requirements.txt + # -r requirements.txt # bleach # pytest pillow==10.2.0 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail -playwright==1.40.0 +playwright==1.42.0 # via - # -r requirements/requirements-test.in + # -r requirements-test.in # pytest-playwright pluggy==1.3.0 # via pytest psycopg2-binary==2.9.9 - # via -r requirements/requirements.txt + # via -r requirements.txt puput==2.0.0 - # via -r requirements/requirements.txt + # via -r requirements.txt pycparser==2.21 # via - # -r requirements/requirements.txt + # -r requirements.txt # cffi pyee==11.0.1 # via playwright pytest==7.4.4 # via - # -r requirements/requirements-test.in + # -r requirements-test.in # pytest-base-url # pytest-django # pytest-mock # pytest-playwright pytest-base-url==2.0.0 # via pytest-playwright -pytest-django==4.7.0 - # via -r requirements/requirements-test.in -pytest-mock==3.12.0 - # via -r requirements/requirements-test.in -pytest-playwright==0.4.3 - # via -r requirements/requirements-test.in +pytest-django==4.8.0 + # via -r requirements-test.in +pytest-mock==3.14.0 + # via -r requirements-test.in +pytest-playwright==0.4.4 + # via -r requirements-test.in python-dateutil==2.8.2 # via # faker # freezegun -python-dotenv==0.21.1 - # via -r requirements/requirements.txt +python-dotenv==1.0.1 + # via -r requirements.txt python-slugify==8.0.1 # via pytest-playwright pytz==2023.3.post1 # via - # -r requirements/requirements.txt + # -r requirements.txt # django-modelcluster # djangorestframework # l18n requests==2.31.0 # via - # -r requirements/requirements.txt + # -r requirements.txt # azure-core # django-anymail # pytest-base-url # wagtail sentry-sdk==1.40.4 - # via -r requirements/requirements.txt + # via -r requirements.txt six==1.16.0 # via - # -r requirements/requirements.txt + # -r requirements.txt # azure-core # bleach # html5lib @@ -245,58 +245,59 @@ six==1.16.0 # python-dateutil sniffio==1.3.0 # via - # -r requirements/requirements.txt + # -r requirements.txt # anyio soupsieve==2.5 # via - # -r requirements/requirements.txt + # -r requirements.txt # beautifulsoup4 sqlparse==0.4.4 # via - # -r requirements/requirements.txt + # -r requirements.txt # django # django-debug-toolbar supervisor==4.2.5 - # via -r requirements/requirements.txt + # via -r requirements.txt telepath==0.3.1 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail text-unidecode==1.3 # via python-slugify -typing-extensions==4.6.3 +typing-extensions==4.10.0 # via - # -r requirements/requirements.txt + # -r requirements.txt # azure-core # azure-storage-blob # dj-database-url # pyee unittest-parametrize==1.4.0 - # via -r requirements/requirements-test.in -urllib3==1.26.18 + # via -r requirements-test.in +urllib3==2.2.1 # via - # -r requirements/requirements.txt + # -r requirements.txt + # django-anymail # requests # sentry-sdk -wagtail==4.1.9 +wagtail==5.0.5 # via - # -r requirements/requirements.txt + # -r requirements.txt # puput # wagtail-markdown wagtail-markdown==0.11.0 # via - # -r requirements/requirements.txt + # -r requirements.txt # puput webencodings==0.5.1 # via - # -r requirements/requirements.txt + # -r requirements.txt # bleach # html5lib -whitenoise==6.3.0 - # via -r requirements/requirements.txt +whitenoise==6.6.0 + # via -r requirements.txt willow==1.6.3 # via - # -r requirements/requirements.txt + # -r requirements.txt # wagtail # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/requirements.in b/requirements/requirements.in index ff8750bc..81280adb 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -1,5 +1,5 @@ Django==4.1.* -wagtail==4.1.* +wagtail==5.0.* django-storages django-storages[azure] psycopg2-binary diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 7e9fe5ca..663b83e6 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -31,10 +31,10 @@ cryptography==41.0.7 defusedxml==0.7.1 # via willow dj-database-url==2.1.0 - # via -r requirements/requirements.in + # via -r requirements.in django==4.1.13 # via - # -r requirements/requirements.in + # -r requirements.in # dj-database-url # django-anymail # django-colorful @@ -53,16 +53,16 @@ django==4.1.13 # puput # sentry-sdk # wagtail -django-anymail==9.0 - # via -r requirements/requirements.in +django-anymail==10.3 + # via -r requirements.in django-colorful==1.3 # via puput -django-debug-toolbar==4.2.0 - # via -r requirements/requirements.in +django-debug-toolbar==4.3.0 + # via -r requirements.in django-el-pagination==4.0.0 # via puput django-extensions==3.2.3 - # via -r requirements/requirements.in + # via -r requirements.in django-filter==22.1 # via wagtail django-modelcluster==6.2.1 @@ -70,21 +70,21 @@ django-modelcluster==6.2.1 django-permissionedforms==0.1 # via wagtail django-recaptcha==4.0.0 - # via -r requirements/requirements.in + # via -r requirements.in django-social-share==2.3.0 # via puput django-storages==1.13.2 - # via -r requirements/requirements.in + # via -r requirements.in django-taggit==3.1.0 # via # puput # wagtail -django-tailwind==3.6.0 - # via -r requirements/requirements.in +django-tailwind==3.8.0 + # via -r requirements.in django-treebeard==4.7 # via wagtail django-widget-tweaks==1.5.0 - # via -r requirements/requirements.in + # via -r requirements.in djangorestframework==3.14.0 # via wagtail draftjs-exporter==2.1.7 @@ -112,13 +112,13 @@ packaging==23.2 pillow==10.2.0 # via wagtail psycopg2-binary==2.9.9 - # via -r requirements/requirements.in + # via -r requirements.in puput==2.0.0 - # via -r requirements/requirements.in + # via -r requirements.in pycparser==2.21 # via cffi -python-dotenv==0.21.1 - # via -r requirements/requirements.in +python-dotenv==1.0.1 + # via -r requirements.in pytz==2023.3.post1 # via # django-modelcluster @@ -130,10 +130,10 @@ requests==2.31.0 # django-anymail # wagtail sentry-sdk==1.40.4 - # via -r requirements/requirements.in + # via -r requirements.in six==1.16.0 # via - # -r requirements/requirements.in + # -r requirements.in # azure-core # bleach # html5lib @@ -148,23 +148,24 @@ sqlparse==0.4.4 # django # django-debug-toolbar supervisor==4.2.5 - # via -r requirements/requirements.in + # via -r requirements.in telepath==0.3.1 # via wagtail -typing-extensions==4.6.3 +typing-extensions==4.10.0 # via - # -r requirements/requirements.in + # -r requirements.in # azure-core # azure-storage-blob # dj-database-url -urllib3==1.26.18 +urllib3==2.2.1 # via - # -r requirements/requirements.in + # -r requirements.in + # django-anymail # requests # sentry-sdk -wagtail==4.1.9 +wagtail==5.0.5 # via - # -r requirements/requirements.in + # -r requirements.in # puput # wagtail-markdown wagtail-markdown==0.11.0 @@ -173,8 +174,8 @@ webencodings==0.5.1 # via # bleach # html5lib -whitenoise==6.3.0 - # via -r requirements/requirements.in +whitenoise==6.6.0 + # via -r requirements.in willow==1.6.3 # via wagtail