diff --git a/.flake8 b/.flake8 deleted file mode 100644 index 65d32f32d..000000000 --- a/.flake8 +++ /dev/null @@ -1,3 +0,0 @@ -[flake8] -ignore = E501,F405,W503 -exclude = */migrations/*,node_modules/,tbx/settings/local.py diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index fbd3241ce..789c480c6 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -7,3 +7,6 @@ # npm run format after updating npm packages f410c3005af905ea791c21bd0558b11d2083ee1c 30aad5e765049bd537568290aad6e4c2450725cd + +# ruff linting +f9c99af0f7637bc32955ce63e54d558fa57e2a52 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8edf7953e..46072585d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,21 +2,12 @@ default_language_version: node: system python: python3.13 repos: - - repo: https://github.com/psf/black-pre-commit-mirror - rev: 24.10.0 + - repo: https://github.com/astral-sh/ruff-pre-commit + rev: 'v0.9.1' # keep in sync with pyproject.toml hooks: - - id: black - language_version: python3.13 - exclude: .+/migrations - - repo: https://github.com/PyCQA/isort - rev: 5.13.2 - hooks: - - id: isort - - repo: https://github.com/pycqa/flake8 - # flake8 config is in setup.cfg - rev: 7.1.1 - hooks: - - id: flake8 + - id: ruff + args: [--fix, --exit-non-zero-on-fix] + - id: ruff-format - repo: local hooks: diff --git a/.prettierignore b/.prettierignore index 6e3b702b9..6f63f6b8f 100644 --- a/.prettierignore +++ b/.prettierignore @@ -2,3 +2,4 @@ static_compiled *.html coverage venv +.venv diff --git a/fabfile.py b/fabfile.py index f2ac16def..9079be090 100644 --- a/fabfile.py +++ b/fabfile.py @@ -1,11 +1,12 @@ import datetime import os -import subprocess from shlex import quote +import subprocess from invoke import run as local from invoke.tasks import task + # Process .env file if os.path.exists(".env"): with open(".env") as f: @@ -137,15 +138,11 @@ def psql(c, command=None): @task def delete_docker_database(c, local_database_name=LOCAL_DATABASE_NAME): dexec( - "dropdb --if-exists --host db --username={project_name} {database_name}".format( - project_name=PROJECT_NAME, database_name=LOCAL_DATABASE_NAME - ), + f"dropdb --if-exists --host db --username={PROJECT_NAME} {LOCAL_DATABASE_NAME}", "db", ) dexec( - "createdb --host db --username={project_name} {database_name}".format( - project_name=PROJECT_NAME, database_name=LOCAL_DATABASE_NAME - ), + f"createdb --host db --username={PROJECT_NAME} {LOCAL_DATABASE_NAME}", "db", ) psql(c, "CREATE SCHEMA heroku_ext;") @@ -160,12 +157,8 @@ def import_data(c, database_filename): delete_docker_database(c) # Import the database file to the db container dexec( - "pg_restore --clean --no-acl --if-exists --no-owner --host db \ - --username={project_name} -d {database_name} {database_filename}".format( - project_name=PROJECT_NAME, - database_name=LOCAL_DATABASE_NAME, - database_filename=database_filename, - ), + f"pg_restore --clean --no-acl --if-exists --no-owner --host db \ + --username={PROJECT_NAME} -d {LOCAL_DATABASE_NAME} {database_filename}", service="db", ) print( @@ -275,12 +268,8 @@ def delete_local_database(c, local_database_name=LOCAL_DATABASE_NAME): def aws(c, command, aws_access_key_id, aws_secret_access_key): return local( - "AWS_ACCESS_KEY_ID={access_key_id} AWS_SECRET_ACCESS_KEY={secret_key} " - "aws {command}".format( - access_key_id=aws_access_key_id, - secret_key=aws_secret_access_key, - command=command, - ) + f"AWS_ACCESS_KEY_ID={aws_access_key_id} AWS_SECRET_ACCESS_KEY={aws_secret_access_key} " + f"aws {command}" ) @@ -291,10 +280,7 @@ def pull_media_from_s3( aws_storage_bucket_name, local_media_dir=LOCAL_MEDIA_DIR, ): - aws_cmd = "s3 sync --delete s3://{bucket_name} {local_media}".format( - bucket_name=aws_storage_bucket_name, - local_media=local_media_dir, - ) + aws_cmd = f"s3 sync --delete s3://{aws_storage_bucket_name} {local_media_dir}" aws(c, aws_cmd, aws_access_key_id, aws_secret_access_key) @@ -318,11 +304,7 @@ def pull_images_from_s3( aws_storage_bucket_name, local_images_dir=LOCAL_IMAGES_DIR, ): - aws_cmd = ( - "s3 sync --delete s3://{bucket_name}/original_images {local_media}".format( - bucket_name=aws_storage_bucket_name, local_media=local_images_dir - ) - ) + aws_cmd = f"s3 sync --delete s3://{aws_storage_bucket_name}/original_images {local_images_dir}" aws(c, aws_cmd, aws_access_key_id, aws_secret_access_key) # The above command just syncs the original images, so we need to drop the wagtailimages_renditions # table so that the renditions will be re-created when requested on the local build. @@ -351,18 +333,13 @@ def pull_database_from_heroku(c, app_instance, anonymise=False): datestamp = datetime.datetime.now().strftime("%Y%m%d-%H%M%S") local( - "heroku pg:backups:download --output={dump_folder}/{datestamp}.dump --app {app}".format( - app=app_instance, dump_folder=LOCAL_DUMP_DIR, datestamp=datestamp - ), + f"heroku pg:backups:download --output={LOCAL_DUMP_DIR}/{datestamp}.dump --app {app_instance}", ) import_data(c, f"/app/{LOCAL_DUMP_DIR}/{datestamp}.dump") local( - "rm {dump_folder}/{datestamp}.dump".format( - dump_folder=LOCAL_DUMP_DIR, - datestamp=datestamp, - ), + f"rm {LOCAL_DUMP_DIR}/{datestamp}.dump", ) if anonymise: @@ -394,13 +371,9 @@ def make_bold(msg): def dellar_snapshot(c, filename): """Snapshot the database, files will be stored in the db container""" dexec( - "pg_dump -d {database_name} -U {database_username} > {filename}.psql".format( - database_name=LOCAL_DATABASE_NAME, - database_username=LOCAL_DATABASE_USERNAME, - filename=filename, - ), + f"pg_dump -d {LOCAL_DATABASE_NAME} -U {LOCAL_DATABASE_USERNAME} > {filename}.psql", service="db", - ), + ) print("Database snapshot created") @@ -409,14 +382,12 @@ def dellar_restore(c, filename): """Restore the database from a snapshot in the db container""" delete_docker_database(c) - dexec( - "psql -U {database_username} -d {database_name} < {filename}.psql".format( - database_name=LOCAL_DATABASE_NAME, - database_username=LOCAL_DATABASE_USERNAME, - filename=filename, + ( + dexec( + f"psql -U {LOCAL_DATABASE_USERNAME} -d {LOCAL_DATABASE_NAME} < {filename}.psql", + service="db", ), - service="db", - ), + ) print("Database restored.") @@ -426,10 +397,10 @@ def dellar_list(c): print("Database snapshots:") dexec( """for f in *.psql; do - printf ' - %s\n' "${f%.psql}" - done""", + printf ' - %s\n' "${f%.psql}" + done""", service="db", - ), + ) print("Restore with `dellar-restore `") @@ -439,7 +410,7 @@ def dellar_remove(c, filename): dexec( f"rm {filename}.psql", service="db", - ), + ) print(f"Snapshot {filename} removed") diff --git a/gunicorn-conf.py b/gunicorn-conf.py index 377ae809d..6170b6dce 100644 --- a/gunicorn-conf.py +++ b/gunicorn-conf.py @@ -1,4 +1,5 @@ # Replace gunicorn's 'Server' HTTP header to avoid leaking info to attackers import gunicorn + gunicorn.SERVER_SOFTWARE = "" diff --git a/manage.py b/manage.py index b662475c9..3ffdfb721 100755 --- a/manage.py +++ b/manage.py @@ -2,6 +2,7 @@ import os import sys + if __name__ == "__main__": os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tbx.settings.production") diff --git a/poetry.lock b/poetry.lock index 6be919d7e..31e128be5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -25,17 +25,6 @@ files = [ [package.extras] tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"] -[[package]] -name = "aspy-refactor-imports" -version = "3.0.2" -description = "Utilities for refactoring imports in python-like syntax." -optional = false -python-versions = ">=3.7" -files = [ - {file = "aspy.refactor_imports-3.0.2-py2.py3-none-any.whl", hash = "sha256:f306037682479945df61b2e6d01bf97256d68f3e704742768deef549e0d61fbb"}, - {file = "aspy.refactor_imports-3.0.2.tar.gz", hash = "sha256:3c7329cdb2613c46fcd757c8e45120efbc3d4b9db805092911eb605c19c5795c"}, -] - [[package]] name = "babel" version = "2.16.0" @@ -109,50 +98,6 @@ charset-normalizer = ["charset-normalizer"] html5lib = ["html5lib"] lxml = ["lxml"] -[[package]] -name = "black" -version = "24.10.0" -description = "The uncompromising code formatter." -optional = false -python-versions = ">=3.9" -files = [ - {file = "black-24.10.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e6668650ea4b685440857138e5fe40cde4d652633b1bdffc62933d0db4ed9812"}, - {file = "black-24.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1c536fcf674217e87b8cc3657b81809d3c085d7bf3ef262ead700da345bfa6ea"}, - {file = "black-24.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:649fff99a20bd06c6f727d2a27f401331dc0cc861fb69cde910fe95b01b5928f"}, - {file = "black-24.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:fe4d6476887de70546212c99ac9bd803d90b42fc4767f058a0baa895013fbb3e"}, - {file = "black-24.10.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5a2221696a8224e335c28816a9d331a6c2ae15a2ee34ec857dcf3e45dbfa99ad"}, - {file = "black-24.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f9da3333530dbcecc1be13e69c250ed8dfa67f43c4005fb537bb426e19200d50"}, - {file = "black-24.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4007b1393d902b48b36958a216c20c4482f601569d19ed1df294a496eb366392"}, - {file = "black-24.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:394d4ddc64782e51153eadcaaca95144ac4c35e27ef9b0a42e121ae7e57a9175"}, - {file = "black-24.10.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b5e39e0fae001df40f95bd8cc36b9165c5e2ea88900167bddf258bacef9bbdc3"}, - {file = "black-24.10.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d37d422772111794b26757c5b55a3eade028aa3fde43121ab7b673d050949d65"}, - {file = "black-24.10.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:14b3502784f09ce2443830e3133dacf2c0110d45191ed470ecb04d0f5f6fcb0f"}, - {file = "black-24.10.0-cp312-cp312-win_amd64.whl", hash = "sha256:30d2c30dc5139211dda799758559d1b049f7f14c580c409d6ad925b74a4208a8"}, - {file = "black-24.10.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:1cbacacb19e922a1d75ef2b6ccaefcd6e93a2c05ede32f06a21386a04cedb981"}, - {file = "black-24.10.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:1f93102e0c5bb3907451063e08b9876dbeac810e7da5a8bfb7aeb5a9ef89066b"}, - {file = "black-24.10.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ddacb691cdcdf77b96f549cf9591701d8db36b2f19519373d60d31746068dbf2"}, - {file = "black-24.10.0-cp313-cp313-win_amd64.whl", hash = "sha256:680359d932801c76d2e9c9068d05c6b107f2584b2a5b88831c83962eb9984c1b"}, - {file = "black-24.10.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:17374989640fbca88b6a448129cd1745c5eb8d9547b464f281b251dd00155ccd"}, - {file = "black-24.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:63f626344343083322233f175aaf372d326de8436f5928c042639a4afbbf1d3f"}, - {file = "black-24.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ccfa1d0cb6200857f1923b602f978386a3a2758a65b52e0950299ea014be6800"}, - {file = "black-24.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:2cd9c95431d94adc56600710f8813ee27eea544dd118d45896bb734e9d7a0dc7"}, - {file = "black-24.10.0-py3-none-any.whl", hash = "sha256:3bb2b7a1f7b685f85b11fed1ef10f8a9148bceb49853e47a294a3dd963c1dd7d"}, - {file = "black-24.10.0.tar.gz", hash = "sha256:846ea64c97afe3bc677b761787993be4991810ecc7a4a937816dd6bddedc4875"}, -] - -[package.dependencies] -click = ">=8.0.0" -mypy-extensions = ">=0.4.3" -packaging = ">=22.0" -pathspec = ">=0.9.0" -platformdirs = ">=2" - -[package.extras] -colorama = ["colorama (>=0.4.3)"] -d = ["aiohttp (>=3.10)"] -jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] -uvloop = ["uvloop (>=0.15.2)"] - [[package]] name = "bleach" version = "4.1.0" @@ -171,17 +116,17 @@ webencodings = "*" [[package]] name = "boto3" -version = "1.35.94" +version = "1.35.98" description = "The AWS SDK for Python" optional = false python-versions = ">=3.8" files = [ - {file = "boto3-1.35.94-py3-none-any.whl", hash = "sha256:516c514fb447d6f216833d06a0781c003fcf43099a4ca2f5a363a8afe0942070"}, - {file = "boto3-1.35.94.tar.gz", hash = "sha256:5aa606239f0fe0dca0506e0ad6bbe4c589048e7e6c2486cee5ec22b6aa7ec2f8"}, + {file = "boto3-1.35.98-py3-none-any.whl", hash = "sha256:d0224e1499d7189b47aa7f469d96522d98df6f5702fccb20a95a436582ebcd9d"}, + {file = "boto3-1.35.98.tar.gz", hash = "sha256:4b6274b4fe9d7113f978abea66a1f20c8a397c268c9d1b2a6c96b14a256da4a5"}, ] [package.dependencies] -botocore = ">=1.35.94,<1.36.0" +botocore = ">=1.35.98,<1.36.0" jmespath = ">=0.7.1,<2.0.0" s3transfer = ">=0.10.0,<0.11.0" @@ -190,13 +135,13 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.35.94" +version = "1.35.98" description = "Low-level, data-driven core of boto 3." optional = false python-versions = ">=3.8" files = [ - {file = "botocore-1.35.94-py3-none-any.whl", hash = "sha256:d784d944865d8279c79d2301fc09ac28b5221d4e7328fb4e23c642c253b9932c"}, - {file = "botocore-1.35.94.tar.gz", hash = "sha256:2b3309b356541faa4d88bb957dcac1d8004aa44953c0b7d4521a6cc5d3d5d6ba"}, + {file = "botocore-1.35.98-py3-none-any.whl", hash = "sha256:4f1c0b687488663a774ad3a5e81a5f94fae1bcada2364cfdc48482c4dbf794d5"}, + {file = "botocore-1.35.98.tar.gz", hash = "sha256:d11742b3824bdeac3c89eeeaf5132351af41823bbcef8fc15e95c8250b1de09c"}, ] [package.dependencies] @@ -958,13 +903,13 @@ doc = ["Sphinx", "sphinx-rtd-theme", "sphinxcontrib-spelling"] [[package]] name = "faker" -version = "33.3.0" +version = "33.3.1" description = "Faker is a Python package that generates fake data for you." optional = false python-versions = ">=3.8" files = [ - {file = "Faker-33.3.0-py3-none-any.whl", hash = "sha256:ae074d9c7ef65817a93b448141a5531a16b2ea2e563dc5774578197c7c84060c"}, - {file = "faker-33.3.0.tar.gz", hash = "sha256:2abb551a05b75d268780b6095100a48afc43c53e97422002efbfc1272ebf5f26"}, + {file = "Faker-33.3.1-py3-none-any.whl", hash = "sha256:ac4cf2f967ce02c898efa50651c43180bd658a7707cfd676fcc5410ad1482c03"}, + {file = "faker-33.3.1.tar.gz", hash = "sha256:49dde3b06a5602177bc2ad013149b6f60a290b7154539180d37b6f876ae79b20"}, ] [package.dependencies] @@ -998,22 +943,6 @@ files = [ {file = "filetype-1.2.0.tar.gz", hash = "sha256:66b56cd6474bf41d8c54660347d37afcc3f7d1970648de365c102ef77548aadb"}, ] -[[package]] -name = "flake8" -version = "7.1.1" -description = "the modular source code checker: pep8 pyflakes and co" -optional = false -python-versions = ">=3.8.1" -files = [ - {file = "flake8-7.1.1-py2.py3-none-any.whl", hash = "sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213"}, - {file = "flake8-7.1.1.tar.gz", hash = "sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38"}, -] - -[package.dependencies] -mccabe = ">=0.7.0,<0.8.0" -pycodestyle = ">=2.12.0,<2.13.0" -pyflakes = ">=3.2.0,<3.3.0" - [[package]] name = "ghp-import" version = "2.1.0" @@ -1130,20 +1059,6 @@ files = [ {file = "invoke-2.2.0.tar.gz", hash = "sha256:ee6cbb101af1a859c7fe84f2a264c059020b0cb7fe3535f9424300ab568f6bd5"}, ] -[[package]] -name = "isort" -version = "5.13.2" -description = "A Python utility / library to sort Python imports." -optional = false -python-versions = ">=3.8.0" -files = [ - {file = "isort-5.13.2-py3-none-any.whl", hash = "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6"}, - {file = "isort-5.13.2.tar.gz", hash = "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109"}, -] - -[package.extras] -colors = ["colorama (>=0.4.6)"] - [[package]] name = "jedi" version = "0.19.2" @@ -1208,13 +1123,13 @@ six = "*" [[package]] name = "laces" -version = "0.1.1" +version = "0.1.2" description = "Django components that know how to render themselves." optional = false python-versions = ">=3.8" files = [ - {file = "laces-0.1.1-py3-none-any.whl", hash = "sha256:ae2c575b9aaa46154e5518c61c9f86f5a9478f753a51e9c5547c7d275d361242"}, - {file = "laces-0.1.1.tar.gz", hash = "sha256:e45159c46f6adca33010d34e9af869e57201b70675c6dc088e919b16c89456a4"}, + {file = "laces-0.1.2-py3-none-any.whl", hash = "sha256:980cdaf9a31e883a2b8198132e2388931a4eb8814f5bfa5d8bba13ff9f657b7c"}, + {file = "laces-0.1.2.tar.gz", hash = "sha256:3218e09c1889ae5cf3fc7a82f5bb63ec0c7879889b6a9760bfc42323c694b84d"}, ] [package.dependencies] @@ -1309,17 +1224,6 @@ files = [ {file = "markupsafe-3.0.2.tar.gz", hash = "sha256:ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0"}, ] -[[package]] -name = "mccabe" -version = "0.7.0" -description = "McCabe checker, plugin for flake8" -optional = false -python-versions = ">=3.6" -files = [ - {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"}, - {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"}, -] - [[package]] name = "mergedeep" version = "1.3.4" @@ -1417,17 +1321,6 @@ files = [ {file = "mkdocs_material_extensions-1.3.1.tar.gz", hash = "sha256:10c9511cea88f568257f960358a467d12b970e1f7b2c0e5fb2bb48cab1928443"}, ] -[[package]] -name = "mypy-extensions" -version = "1.0.0" -description = "Type system extensions for programs checked with the mypy type checker." -optional = false -python-versions = ">=3.5" -files = [ - {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"}, - {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"}, -] - [[package]] name = "nodeenv" version = "1.9.1" @@ -1794,17 +1687,6 @@ urwid-readline = "*" [package.extras] completion = ["shtab"] -[[package]] -name = "pycodestyle" -version = "2.12.1" -description = "Python style guide checker" -optional = false -python-versions = ">=3.8" -files = [ - {file = "pycodestyle-2.12.1-py2.py3-none-any.whl", hash = "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3"}, - {file = "pycodestyle-2.12.1.tar.gz", hash = "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521"}, -] - [[package]] name = "pycparser" version = "2.22" @@ -1816,17 +1698,6 @@ files = [ {file = "pycparser-2.22.tar.gz", hash = "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6"}, ] -[[package]] -name = "pyflakes" -version = "3.2.0" -description = "passive checker of Python programs" -optional = false -python-versions = ">=3.8" -files = [ - {file = "pyflakes-3.2.0-py2.py3-none-any.whl", hash = "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a"}, - {file = "pyflakes-3.2.0.tar.gz", hash = "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f"}, -] - [[package]] name = "pygments" version = "2.19.1" @@ -2125,6 +1996,33 @@ urllib3 = ">=1.21.1,<3" socks = ["PySocks (>=1.5.6,!=1.5.7)"] use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] +[[package]] +name = "ruff" +version = "0.9.1" +description = "An extremely fast Python linter and code formatter, written in Rust." +optional = false +python-versions = ">=3.7" +files = [ + {file = "ruff-0.9.1-py3-none-linux_armv6l.whl", hash = "sha256:84330dda7abcc270e6055551aca93fdde1b0685fc4fd358f26410f9349cf1743"}, + {file = "ruff-0.9.1-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:3cae39ba5d137054b0e5b472aee3b78a7c884e61591b100aeb544bcd1fc38d4f"}, + {file = "ruff-0.9.1-py3-none-macosx_11_0_arm64.whl", hash = "sha256:50c647ff96f4ba288db0ad87048257753733763b409b2faf2ea78b45c8bb7fcb"}, + {file = "ruff-0.9.1-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f0c8b149e9c7353cace7d698e1656ffcf1e36e50f8ea3b5d5f7f87ff9986a7ca"}, + {file = "ruff-0.9.1-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:beb3298604540c884d8b282fe7625651378e1986c25df51dec5b2f60cafc31ce"}, + {file = "ruff-0.9.1-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:39d0174ccc45c439093971cc06ed3ac4dc545f5e8bdacf9f067adf879544d969"}, + {file = "ruff-0.9.1-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:69572926c0f0c9912288915214ca9b2809525ea263603370b9e00bed2ba56dbd"}, + {file = "ruff-0.9.1-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:937267afce0c9170d6d29f01fcd1f4378172dec6760a9f4dface48cdabf9610a"}, + {file = "ruff-0.9.1-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:186c2313de946f2c22bdf5954b8dd083e124bcfb685732cfb0beae0c47233d9b"}, + {file = "ruff-0.9.1-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f94942a3bb767675d9a051867c036655fe9f6c8a491539156a6f7e6b5f31831"}, + {file = "ruff-0.9.1-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:728d791b769cc28c05f12c280f99e8896932e9833fef1dd8756a6af2261fd1ab"}, + {file = "ruff-0.9.1-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:2f312c86fb40c5c02b44a29a750ee3b21002bd813b5233facdaf63a51d9a85e1"}, + {file = "ruff-0.9.1-py3-none-musllinux_1_2_i686.whl", hash = "sha256:ae017c3a29bee341ba584f3823f805abbe5fe9cd97f87ed07ecbf533c4c88366"}, + {file = "ruff-0.9.1-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:5dc40a378a0e21b4cfe2b8a0f1812a6572fc7b230ef12cd9fac9161aa91d807f"}, + {file = "ruff-0.9.1-py3-none-win32.whl", hash = "sha256:46ebf5cc106cf7e7378ca3c28ce4293b61b449cd121b98699be727d40b79ba72"}, + {file = "ruff-0.9.1-py3-none-win_amd64.whl", hash = "sha256:342a824b46ddbcdddd3abfbb332fa7fcaac5488bf18073e841236aadf4ad5c19"}, + {file = "ruff-0.9.1-py3-none-win_arm64.whl", hash = "sha256:1cd76c7f9c679e6e8f2af8f778367dca82b95009bc7b1a85a47f1521ae524fa7"}, + {file = "ruff-0.9.1.tar.gz", hash = "sha256:fd2b25ecaf907d6458fa842675382c8597b3c746a2dde6717fe3415425df0c17"}, +] + [[package]] name = "s3transfer" version = "0.10.4" @@ -2220,29 +2118,15 @@ psutil = ">=5,<6" urllib3 = "*" wrapt = ">=1.10,<2.0" -[[package]] -name = "seed-isort-config" -version = "2.2.0" -description = "Statically populate the `known_third_party` `isort` setting." -optional = false -python-versions = ">=3.6.1" -files = [ - {file = "seed_isort_config-2.2.0-py2.py3-none-any.whl", hash = "sha256:8601fb715a5a4aac39256bbf73c2da6a81f964da9c9d9897ab9074db3663526f"}, - {file = "seed_isort_config-2.2.0.tar.gz", hash = "sha256:be4cfef8f9a3fe8ea1817069c6b624538ac0b429636ec746edeb27e98ed628c8"}, -] - -[package.dependencies] -"aspy.refactor-imports" = "*" - [[package]] name = "sentry-sdk" -version = "2.19.2" +version = "2.20.0" description = "Python client for Sentry (https://sentry.io)" optional = false python-versions = ">=3.6" files = [ - {file = "sentry_sdk-2.19.2-py2.py3-none-any.whl", hash = "sha256:ebdc08228b4d131128e568d696c210d846e5b9d70aa0327dec6b1272d9d40b84"}, - {file = "sentry_sdk-2.19.2.tar.gz", hash = "sha256:467df6e126ba242d39952375dd816fbee0f217d119bf454a8ce74cf1e7909e8d"}, + {file = "sentry_sdk-2.20.0-py2.py3-none-any.whl", hash = "sha256:c359a1edf950eb5e80cffd7d9111f3dbeef57994cb4415df37d39fda2cf22364"}, + {file = "sentry_sdk-2.20.0.tar.gz", hash = "sha256:afa82713a92facf847df3c6f63cec71eb488d826a50965def3d7722aa6f0fdab"}, ] [package.dependencies] @@ -2287,6 +2171,7 @@ sqlalchemy = ["sqlalchemy (>=1.2)"] starlette = ["starlette (>=0.19.1)"] starlite = ["starlite (>=1.48)"] tornado = ["tornado (>=6)"] +unleash = ["UnleashClient (>=6.0.1)"] [[package]] name = "six" @@ -2714,79 +2599,93 @@ wand = ["Wand (>=0.6,<1.0)"] [[package]] name = "wrapt" -version = "1.17.0" +version = "1.17.2" description = "Module for decorators, wrappers and monkey patching." optional = false python-versions = ">=3.8" files = [ - {file = "wrapt-1.17.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2a0c23b8319848426f305f9cb0c98a6e32ee68a36264f45948ccf8e7d2b941f8"}, - {file = "wrapt-1.17.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b1ca5f060e205f72bec57faae5bd817a1560fcfc4af03f414b08fa29106b7e2d"}, - {file = "wrapt-1.17.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e185ec6060e301a7e5f8461c86fb3640a7beb1a0f0208ffde7a65ec4074931df"}, - {file = "wrapt-1.17.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bb90765dd91aed05b53cd7a87bd7f5c188fcd95960914bae0d32c5e7f899719d"}, - {file = "wrapt-1.17.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:879591c2b5ab0a7184258274c42a126b74a2c3d5a329df16d69f9cee07bba6ea"}, - {file = "wrapt-1.17.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:fce6fee67c318fdfb7f285c29a82d84782ae2579c0e1b385b7f36c6e8074fffb"}, - {file = "wrapt-1.17.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:0698d3a86f68abc894d537887b9bbf84d29bcfbc759e23f4644be27acf6da301"}, - {file = "wrapt-1.17.0-cp310-cp310-win32.whl", hash = "sha256:69d093792dc34a9c4c8a70e4973a3361c7a7578e9cd86961b2bbf38ca71e4e22"}, - {file = "wrapt-1.17.0-cp310-cp310-win_amd64.whl", hash = "sha256:f28b29dc158ca5d6ac396c8e0a2ef45c4e97bb7e65522bfc04c989e6fe814575"}, - {file = "wrapt-1.17.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:74bf625b1b4caaa7bad51d9003f8b07a468a704e0644a700e936c357c17dd45a"}, - {file = "wrapt-1.17.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f2a28eb35cf99d5f5bd12f5dd44a0f41d206db226535b37b0c60e9da162c3ed"}, - {file = "wrapt-1.17.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:81b1289e99cf4bad07c23393ab447e5e96db0ab50974a280f7954b071d41b489"}, - {file = "wrapt-1.17.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9f2939cd4a2a52ca32bc0b359015718472d7f6de870760342e7ba295be9ebaf9"}, - {file = "wrapt-1.17.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6a9653131bda68a1f029c52157fd81e11f07d485df55410401f745007bd6d339"}, - {file = "wrapt-1.17.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:4e4b4385363de9052dac1a67bfb535c376f3d19c238b5f36bddc95efae15e12d"}, - {file = "wrapt-1.17.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:bdf62d25234290db1837875d4dceb2151e4ea7f9fff2ed41c0fde23ed542eb5b"}, - {file = "wrapt-1.17.0-cp311-cp311-win32.whl", hash = "sha256:5d8fd17635b262448ab8f99230fe4dac991af1dabdbb92f7a70a6afac8a7e346"}, - {file = "wrapt-1.17.0-cp311-cp311-win_amd64.whl", hash = "sha256:92a3d214d5e53cb1db8b015f30d544bc9d3f7179a05feb8f16df713cecc2620a"}, - {file = "wrapt-1.17.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:89fc28495896097622c3fc238915c79365dd0ede02f9a82ce436b13bd0ab7569"}, - {file = "wrapt-1.17.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:875d240fdbdbe9e11f9831901fb8719da0bd4e6131f83aa9f69b96d18fae7504"}, - {file = "wrapt-1.17.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e5ed16d95fd142e9c72b6c10b06514ad30e846a0d0917ab406186541fe68b451"}, - {file = "wrapt-1.17.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:18b956061b8db634120b58f668592a772e87e2e78bc1f6a906cfcaa0cc7991c1"}, - {file = "wrapt-1.17.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:daba396199399ccabafbfc509037ac635a6bc18510ad1add8fd16d4739cdd106"}, - {file = "wrapt-1.17.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:4d63f4d446e10ad19ed01188d6c1e1bb134cde8c18b0aa2acfd973d41fcc5ada"}, - {file = "wrapt-1.17.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:8a5e7cc39a45fc430af1aefc4d77ee6bad72c5bcdb1322cfde852c15192b8bd4"}, - {file = "wrapt-1.17.0-cp312-cp312-win32.whl", hash = "sha256:0a0a1a1ec28b641f2a3a2c35cbe86c00051c04fffcfcc577ffcdd707df3f8635"}, - {file = "wrapt-1.17.0-cp312-cp312-win_amd64.whl", hash = "sha256:3c34f6896a01b84bab196f7119770fd8466c8ae3dfa73c59c0bb281e7b588ce7"}, - {file = "wrapt-1.17.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:714c12485aa52efbc0fc0ade1e9ab3a70343db82627f90f2ecbc898fdf0bb181"}, - {file = "wrapt-1.17.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da427d311782324a376cacb47c1a4adc43f99fd9d996ffc1b3e8529c4074d393"}, - {file = "wrapt-1.17.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ba1739fb38441a27a676f4de4123d3e858e494fac05868b7a281c0a383c098f4"}, - {file = "wrapt-1.17.0-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e711fc1acc7468463bc084d1b68561e40d1eaa135d8c509a65dd534403d83d7b"}, - {file = "wrapt-1.17.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:140ea00c87fafc42739bd74a94a5a9003f8e72c27c47cd4f61d8e05e6dec8721"}, - {file = "wrapt-1.17.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:73a96fd11d2b2e77d623a7f26e004cc31f131a365add1ce1ce9a19e55a1eef90"}, - {file = "wrapt-1.17.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:0b48554952f0f387984da81ccfa73b62e52817a4386d070c75e4db7d43a28c4a"}, - {file = "wrapt-1.17.0-cp313-cp313-win32.whl", hash = "sha256:498fec8da10e3e62edd1e7368f4b24aa362ac0ad931e678332d1b209aec93045"}, - {file = "wrapt-1.17.0-cp313-cp313-win_amd64.whl", hash = "sha256:fd136bb85f4568fffca995bd3c8d52080b1e5b225dbf1c2b17b66b4c5fa02838"}, - {file = "wrapt-1.17.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:17fcf043d0b4724858f25b8826c36e08f9fb2e475410bece0ec44a22d533da9b"}, - {file = "wrapt-1.17.0-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4a557d97f12813dc5e18dad9fa765ae44ddd56a672bb5de4825527c847d6379"}, - {file = "wrapt-1.17.0-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0229b247b0fc7dee0d36176cbb79dbaf2a9eb7ecc50ec3121f40ef443155fb1d"}, - {file = "wrapt-1.17.0-cp313-cp313t-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8425cfce27b8b20c9b89d77fb50e368d8306a90bf2b6eef2cdf5cd5083adf83f"}, - {file = "wrapt-1.17.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9c900108df470060174108012de06d45f514aa4ec21a191e7ab42988ff42a86c"}, - {file = "wrapt-1.17.0-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:4e547b447073fc0dbfcbff15154c1be8823d10dab4ad401bdb1575e3fdedff1b"}, - {file = "wrapt-1.17.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:914f66f3b6fc7b915d46c1cc424bc2441841083de01b90f9e81109c9759e43ab"}, - {file = "wrapt-1.17.0-cp313-cp313t-win32.whl", hash = "sha256:a4192b45dff127c7d69b3bdfb4d3e47b64179a0b9900b6351859f3001397dabf"}, - {file = "wrapt-1.17.0-cp313-cp313t-win_amd64.whl", hash = "sha256:4f643df3d4419ea3f856c5c3f40fec1d65ea2e89ec812c83f7767c8730f9827a"}, - {file = "wrapt-1.17.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:69c40d4655e078ede067a7095544bcec5a963566e17503e75a3a3e0fe2803b13"}, - {file = "wrapt-1.17.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f495b6754358979379f84534f8dd7a43ff8cff2558dcdea4a148a6e713a758f"}, - {file = "wrapt-1.17.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:baa7ef4e0886a6f482e00d1d5bcd37c201b383f1d314643dfb0367169f94f04c"}, - {file = "wrapt-1.17.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8fc931382e56627ec4acb01e09ce66e5c03c384ca52606111cee50d931a342d"}, - {file = "wrapt-1.17.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:8f8909cdb9f1b237786c09a810e24ee5e15ef17019f7cecb207ce205b9b5fcce"}, - {file = "wrapt-1.17.0-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:ad47b095f0bdc5585bced35bd088cbfe4177236c7df9984b3cc46b391cc60627"}, - {file = "wrapt-1.17.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:948a9bd0fb2c5120457b07e59c8d7210cbc8703243225dbd78f4dfc13c8d2d1f"}, - {file = "wrapt-1.17.0-cp38-cp38-win32.whl", hash = "sha256:5ae271862b2142f4bc687bdbfcc942e2473a89999a54231aa1c2c676e28f29ea"}, - {file = "wrapt-1.17.0-cp38-cp38-win_amd64.whl", hash = "sha256:f335579a1b485c834849e9075191c9898e0731af45705c2ebf70e0cd5d58beed"}, - {file = "wrapt-1.17.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:d751300b94e35b6016d4b1e7d0e7bbc3b5e1751e2405ef908316c2a9024008a1"}, - {file = "wrapt-1.17.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7264cbb4a18dc4acfd73b63e4bcfec9c9802614572025bdd44d0721983fc1d9c"}, - {file = "wrapt-1.17.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:33539c6f5b96cf0b1105a0ff4cf5db9332e773bb521cc804a90e58dc49b10578"}, - {file = "wrapt-1.17.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c30970bdee1cad6a8da2044febd824ef6dc4cc0b19e39af3085c763fdec7de33"}, - {file = "wrapt-1.17.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:bc7f729a72b16ee21795a943f85c6244971724819819a41ddbaeb691b2dd85ad"}, - {file = "wrapt-1.17.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:6ff02a91c4fc9b6a94e1c9c20f62ea06a7e375f42fe57587f004d1078ac86ca9"}, - {file = "wrapt-1.17.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:2dfb7cff84e72e7bf975b06b4989477873dcf160b2fd89959c629535df53d4e0"}, - {file = "wrapt-1.17.0-cp39-cp39-win32.whl", hash = "sha256:2399408ac33ffd5b200480ee858baa58d77dd30e0dd0cab6a8a9547135f30a88"}, - {file = "wrapt-1.17.0-cp39-cp39-win_amd64.whl", hash = "sha256:4f763a29ee6a20c529496a20a7bcb16a73de27f5da6a843249c7047daf135977"}, - {file = "wrapt-1.17.0-py3-none-any.whl", hash = "sha256:d2c63b93548eda58abf5188e505ffed0229bf675f7c3090f8e36ad55b8cbc371"}, - {file = "wrapt-1.17.0.tar.gz", hash = "sha256:16187aa2317c731170a88ef35e8937ae0f533c402872c1ee5e6d079fcf320801"}, + {file = "wrapt-1.17.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3d57c572081fed831ad2d26fd430d565b76aa277ed1d30ff4d40670b1c0dd984"}, + {file = "wrapt-1.17.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b5e251054542ae57ac7f3fba5d10bfff615b6c2fb09abeb37d2f1463f841ae22"}, + {file = "wrapt-1.17.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:80dd7db6a7cb57ffbc279c4394246414ec99537ae81ffd702443335a61dbf3a7"}, + {file = "wrapt-1.17.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0a6e821770cf99cc586d33833b2ff32faebdbe886bd6322395606cf55153246c"}, + {file = "wrapt-1.17.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b60fb58b90c6d63779cb0c0c54eeb38941bae3ecf7a73c764c52c88c2dcb9d72"}, + {file = "wrapt-1.17.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b870b5df5b71d8c3359d21be8f0d6c485fa0ebdb6477dda51a1ea54a9b558061"}, + {file = "wrapt-1.17.2-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:4011d137b9955791f9084749cba9a367c68d50ab8d11d64c50ba1688c9b457f2"}, + {file = "wrapt-1.17.2-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:1473400e5b2733e58b396a04eb7f35f541e1fb976d0c0724d0223dd607e0f74c"}, + {file = "wrapt-1.17.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:3cedbfa9c940fdad3e6e941db7138e26ce8aad38ab5fe9dcfadfed9db7a54e62"}, + {file = "wrapt-1.17.2-cp310-cp310-win32.whl", hash = "sha256:582530701bff1dec6779efa00c516496968edd851fba224fbd86e46cc6b73563"}, + {file = "wrapt-1.17.2-cp310-cp310-win_amd64.whl", hash = "sha256:58705da316756681ad3c9c73fd15499aa4d8c69f9fd38dc8a35e06c12468582f"}, + {file = "wrapt-1.17.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ff04ef6eec3eee8a5efef2401495967a916feaa353643defcc03fc74fe213b58"}, + {file = "wrapt-1.17.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4db983e7bca53819efdbd64590ee96c9213894272c776966ca6306b73e4affda"}, + {file = "wrapt-1.17.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:9abc77a4ce4c6f2a3168ff34b1da9b0f311a8f1cfd694ec96b0603dff1c79438"}, + {file = "wrapt-1.17.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0b929ac182f5ace000d459c59c2c9c33047e20e935f8e39371fa6e3b85d56f4a"}, + {file = "wrapt-1.17.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f09b286faeff3c750a879d336fb6d8713206fc97af3adc14def0cdd349df6000"}, + {file = "wrapt-1.17.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1a7ed2d9d039bd41e889f6fb9364554052ca21ce823580f6a07c4ec245c1f5d6"}, + {file = "wrapt-1.17.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:129a150f5c445165ff941fc02ee27df65940fcb8a22a61828b1853c98763a64b"}, + {file = "wrapt-1.17.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:1fb5699e4464afe5c7e65fa51d4f99e0b2eadcc176e4aa33600a3df7801d6662"}, + {file = "wrapt-1.17.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:9a2bce789a5ea90e51a02dfcc39e31b7f1e662bc3317979aa7e5538e3a034f72"}, + {file = "wrapt-1.17.2-cp311-cp311-win32.whl", hash = "sha256:4afd5814270fdf6380616b321fd31435a462019d834f83c8611a0ce7484c7317"}, + {file = "wrapt-1.17.2-cp311-cp311-win_amd64.whl", hash = "sha256:acc130bc0375999da18e3d19e5a86403667ac0c4042a094fefb7eec8ebac7cf3"}, + {file = "wrapt-1.17.2-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:d5e2439eecc762cd85e7bd37161d4714aa03a33c5ba884e26c81559817ca0925"}, + {file = "wrapt-1.17.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:3fc7cb4c1c744f8c05cd5f9438a3caa6ab94ce8344e952d7c45a8ed59dd88392"}, + {file = "wrapt-1.17.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8fdbdb757d5390f7c675e558fd3186d590973244fab0c5fe63d373ade3e99d40"}, + {file = "wrapt-1.17.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5bb1d0dbf99411f3d871deb6faa9aabb9d4e744d67dcaaa05399af89d847a91d"}, + {file = "wrapt-1.17.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d18a4865f46b8579d44e4fe1e2bcbc6472ad83d98e22a26c963d46e4c125ef0b"}, + {file = "wrapt-1.17.2-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc570b5f14a79734437cb7b0500376b6b791153314986074486e0b0fa8d71d98"}, + {file = "wrapt-1.17.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:6d9187b01bebc3875bac9b087948a2bccefe464a7d8f627cf6e48b1bbae30f82"}, + {file = "wrapt-1.17.2-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:9e8659775f1adf02eb1e6f109751268e493c73716ca5761f8acb695e52a756ae"}, + {file = "wrapt-1.17.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e8b2816ebef96d83657b56306152a93909a83f23994f4b30ad4573b00bd11bb9"}, + {file = "wrapt-1.17.2-cp312-cp312-win32.whl", hash = "sha256:468090021f391fe0056ad3e807e3d9034e0fd01adcd3bdfba977b6fdf4213ea9"}, + {file = "wrapt-1.17.2-cp312-cp312-win_amd64.whl", hash = "sha256:ec89ed91f2fa8e3f52ae53cd3cf640d6feff92ba90d62236a81e4e563ac0e991"}, + {file = "wrapt-1.17.2-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:6ed6ffac43aecfe6d86ec5b74b06a5be33d5bb9243d055141e8cabb12aa08125"}, + {file = "wrapt-1.17.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:35621ae4c00e056adb0009f8e86e28eb4a41a4bfa8f9bfa9fca7d343fe94f998"}, + {file = "wrapt-1.17.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a604bf7a053f8362d27eb9fefd2097f82600b856d5abe996d623babd067b1ab5"}, + {file = "wrapt-1.17.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5cbabee4f083b6b4cd282f5b817a867cf0b1028c54d445b7ec7cfe6505057cf8"}, + {file = "wrapt-1.17.2-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:49703ce2ddc220df165bd2962f8e03b84c89fee2d65e1c24a7defff6f988f4d6"}, + {file = "wrapt-1.17.2-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8112e52c5822fc4253f3901b676c55ddf288614dc7011634e2719718eaa187dc"}, + {file = "wrapt-1.17.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:9fee687dce376205d9a494e9c121e27183b2a3df18037f89d69bd7b35bcf59e2"}, + {file = "wrapt-1.17.2-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:18983c537e04d11cf027fbb60a1e8dfd5190e2b60cc27bc0808e653e7b218d1b"}, + {file = "wrapt-1.17.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:703919b1633412ab54bcf920ab388735832fdcb9f9a00ae49387f0fe67dad504"}, + {file = "wrapt-1.17.2-cp313-cp313-win32.whl", hash = "sha256:abbb9e76177c35d4e8568e58650aa6926040d6a9f6f03435b7a522bf1c487f9a"}, + {file = "wrapt-1.17.2-cp313-cp313-win_amd64.whl", hash = "sha256:69606d7bb691b50a4240ce6b22ebb319c1cfb164e5f6569835058196e0f3a845"}, + {file = "wrapt-1.17.2-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:4a721d3c943dae44f8e243b380cb645a709ba5bd35d3ad27bc2ed947e9c68192"}, + {file = "wrapt-1.17.2-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:766d8bbefcb9e00c3ac3b000d9acc51f1b399513f44d77dfe0eb026ad7c9a19b"}, + {file = "wrapt-1.17.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:e496a8ce2c256da1eb98bd15803a79bee00fc351f5dfb9ea82594a3f058309e0"}, + {file = "wrapt-1.17.2-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:40d615e4fe22f4ad3528448c193b218e077656ca9ccb22ce2cb20db730f8d306"}, + {file = "wrapt-1.17.2-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a5aaeff38654462bc4b09023918b7f21790efb807f54c000a39d41d69cf552cb"}, + {file = "wrapt-1.17.2-cp313-cp313t-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9a7d15bbd2bc99e92e39f49a04653062ee6085c0e18b3b7512a4f2fe91f2d681"}, + {file = "wrapt-1.17.2-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:e3890b508a23299083e065f435a492b5435eba6e304a7114d2f919d400888cc6"}, + {file = "wrapt-1.17.2-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:8c8b293cd65ad716d13d8dd3624e42e5a19cc2a2f1acc74b30c2c13f15cb61a6"}, + {file = "wrapt-1.17.2-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:4c82b8785d98cdd9fed4cac84d765d234ed3251bd6afe34cb7ac523cb93e8b4f"}, + {file = "wrapt-1.17.2-cp313-cp313t-win32.whl", hash = "sha256:13e6afb7fe71fe7485a4550a8844cc9ffbe263c0f1a1eea569bc7091d4898555"}, + {file = "wrapt-1.17.2-cp313-cp313t-win_amd64.whl", hash = "sha256:eaf675418ed6b3b31c7a989fd007fa7c3be66ce14e5c3b27336383604c9da85c"}, + {file = "wrapt-1.17.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5c803c401ea1c1c18de70a06a6f79fcc9c5acfc79133e9869e730ad7f8ad8ef9"}, + {file = "wrapt-1.17.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f917c1180fdb8623c2b75a99192f4025e412597c50b2ac870f156de8fb101119"}, + {file = "wrapt-1.17.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ecc840861360ba9d176d413a5489b9a0aff6d6303d7e733e2c4623cfa26904a6"}, + {file = "wrapt-1.17.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bb87745b2e6dc56361bfde481d5a378dc314b252a98d7dd19a651a3fa58f24a9"}, + {file = "wrapt-1.17.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:58455b79ec2661c3600e65c0a716955adc2410f7383755d537584b0de41b1d8a"}, + {file = "wrapt-1.17.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b4e42a40a5e164cbfdb7b386c966a588b1047558a990981ace551ed7e12ca9c2"}, + {file = "wrapt-1.17.2-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:91bd7d1773e64019f9288b7a5101f3ae50d3d8e6b1de7edee9c2ccc1d32f0c0a"}, + {file = "wrapt-1.17.2-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:bb90fb8bda722a1b9d48ac1e6c38f923ea757b3baf8ebd0c82e09c5c1a0e7a04"}, + {file = "wrapt-1.17.2-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:08e7ce672e35efa54c5024936e559469436f8b8096253404faeb54d2a878416f"}, + {file = "wrapt-1.17.2-cp38-cp38-win32.whl", hash = "sha256:410a92fefd2e0e10d26210e1dfb4a876ddaf8439ef60d6434f21ef8d87efc5b7"}, + {file = "wrapt-1.17.2-cp38-cp38-win_amd64.whl", hash = "sha256:95c658736ec15602da0ed73f312d410117723914a5c91a14ee4cdd72f1d790b3"}, + {file = "wrapt-1.17.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:99039fa9e6306880572915728d7f6c24a86ec57b0a83f6b2491e1d8ab0235b9a"}, + {file = "wrapt-1.17.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2696993ee1eebd20b8e4ee4356483c4cb696066ddc24bd70bcbb80fa56ff9061"}, + {file = "wrapt-1.17.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:612dff5db80beef9e649c6d803a8d50c409082f1fedc9dbcdfde2983b2025b82"}, + {file = "wrapt-1.17.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62c2caa1585c82b3f7a7ab56afef7b3602021d6da34fbc1cf234ff139fed3cd9"}, + {file = "wrapt-1.17.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c958bcfd59bacc2d0249dcfe575e71da54f9dcf4a8bdf89c4cb9a68a1170d73f"}, + {file = "wrapt-1.17.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fc78a84e2dfbc27afe4b2bd7c80c8db9bca75cc5b85df52bfe634596a1da846b"}, + {file = "wrapt-1.17.2-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:ba0f0eb61ef00ea10e00eb53a9129501f52385c44853dbd6c4ad3f403603083f"}, + {file = "wrapt-1.17.2-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:1e1fe0e6ab7775fd842bc39e86f6dcfc4507ab0ffe206093e76d61cde37225c8"}, + {file = "wrapt-1.17.2-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:c86563182421896d73858e08e1db93afdd2b947a70064b813d515d66549e15f9"}, + {file = "wrapt-1.17.2-cp39-cp39-win32.whl", hash = "sha256:f393cda562f79828f38a819f4788641ac7c4085f30f1ce1a68672baa686482bb"}, + {file = "wrapt-1.17.2-cp39-cp39-win_amd64.whl", hash = "sha256:36ccae62f64235cf8ddb682073a60519426fdd4725524ae38874adf72b5f2aeb"}, + {file = "wrapt-1.17.2-py3-none-any.whl", hash = "sha256:b18f2d1533a71f069c7f82d524a52599053d4c7166e9dd374ae2136b7f40f7c8"}, + {file = "wrapt-1.17.2.tar.gz", hash = "sha256:41388e9d4d1522446fe79d3213196bd9e3b301a336965b9e27ca2788ebd122f3"}, ] [metadata] lock-version = "2.0" python-versions = "^3.13" -content-hash = "b1e94ea87531d887d11a168c58d68e2da42e0bf48110b4af5e672a6c8086b2b0" +content-hash = "dc9ea93c6b55710fd6fefb9af43c6b4f72b8ab0acc1f32ca8cc94b785f3bd077" diff --git a/pyproject.toml b/pyproject.toml index bcbfb2fd2..1266cafe3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,13 +49,10 @@ pudb = "^2024.1" honcho = "^2.0.0" # Linters etc. -black = "^24.10.0" detect-secrets = "^1.5.0" djhtml = "^3.0.6" -flake8 = "^7.1.1" -isort = "^5.13.2" +ruff = "^0.9.1" # update pre-commit-config.yaml too pre-commit = "^4.0.1" -seed-isort-config = "^2.2.0" # Documentation mkdocs = "^1.6.1" @@ -69,16 +66,3 @@ wagtail-factories = "^4.2.1" [build-system] requires = ["poetry>=1,<2"] build-backend = "poetry.masonry.api" - -[tool.black] -line_length = 88 -target-version = ['py312'] -exclude = ''' - /( - .+/migrations - | venv - | \.venv - | node_modules - | \.git - )/ -''' diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 000000000..98cf6b5af --- /dev/null +++ b/ruff.toml @@ -0,0 +1,42 @@ +target-version = "py313" + +[lint] +extend-select = [ + "B", # flake8-bugbear + "C4", # flake8-comprehensions + "DJ", # flake8-django + "E", # pycodestyle errors + "F", # pyflakes + "I", # isort + "INT", # flake8-gettext + "PIE", # flake8-pie + "PGH", # pygrep-hooks + "S", # flake8-bandit + "SIM", # flake8-simplify + "T20", # flake8-print + "W", # pycodestyle warnings + "YTT", # flake8-2020 + "UP", # pyupgrade + "RUF100", # unused noqa +] + +extend-ignore = [ + "E501", # no line length errors +] +fixable = ["C4", "E", "F", "I", "UP"] + +[lint.per-file-ignores] +"fabfile.py" = ["S603", "S607", "T201"] +"tbx/core/utils/scripts/run_flightpath.py" = ["T201"] +"tbx/core/utils/scripts/run_flightpath_status_check.py" = ["T201"] + + +[lint.isort.sections] +"django" = ["django"] +"wagtail" = ["wagtail", "modelcluster"] + +[lint.isort] +known-first-party = ["tbx"] +section-order = ["future", "standard-library", "django", "wagtail", "third-party", "first-party", "local-folder"] +force-sort-within-sections = true +lines-after-imports = 2 diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index d896574ba..000000000 --- a/setup.cfg +++ /dev/null @@ -1,22 +0,0 @@ -[flake8] -ignore = C901,W503 -exclude = */migrations/*,*/node_modules/* -max-line-length = 120 - -[isort] -known_first_party=tbx -known_django=django -known_wagtail=wagtail,modelcluster -skip=migrations,node_modules,venv,.git,__pycache__ -# While not supported, blocked_extensions shortcuts further filesystem operations -# See https://pycqa.github.io/isort/docs/configuration/options/#blocked-extensions -blocked_extensions=rst,html,js,svg,txt,css,scss,png,snap,tsx -sections=STDLIB,DJANGO,WAGTAIL,THIRDPARTY,FIRSTPARTY,LOCALFOLDER -default_section=THIRDPARTY -multi_line_output=3 -include_trailing_comma=True -force_grid_wrap=0 -use_parentheses=True -line_length=88 -known_third_party = bs4,dj_database_url,django,factory,faker,gunicorn,invoke,modelcluster,pattern_library,sentry_sdk,taggit,wagtail,wagtail_factories -profile=black diff --git a/tbx/blog/factories.py b/tbx/blog/factories.py index 70f77cc1f..ce8abb259 100644 --- a/tbx/blog/factories.py +++ b/tbx/blog/factories.py @@ -1,5 +1,6 @@ import factory import wagtail_factories + from tbx.blog.models import BlogIndexPage, BlogPage from tbx.core.factories import StoryBlockFactory diff --git a/tbx/blog/feeds.py b/tbx/blog/feeds.py index 9006a5ef6..818dc7fc2 100644 --- a/tbx/blog/feeds.py +++ b/tbx/blog/feeds.py @@ -6,6 +6,7 @@ from .models import BlogPage + # Main blog feed diff --git a/tbx/blog/migrations/0001_initial.py b/tbx/blog/migrations/0001_initial.py index 5f2d17e13..feb6f6fdf 100644 --- a/tbx/blog/migrations/0001_initial.py +++ b/tbx/blog/migrations/0001_initial.py @@ -2,18 +2,20 @@ from django.db import migrations, models import django.db.models.deletion + import modelcluster.fields -import tbx.core.blocks import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks +import tbx.core.blocks -class Migration(migrations.Migration): +class Migration(migrations.Migration): initial = True dependencies = [ diff --git a/tbx/blog/migrations/0002_remove_blogindexpage_call_to_action_and_more.py b/tbx/blog/migrations/0002_remove_blogindexpage_call_to_action_and_more.py index 22b8f39d9..41d5007c9 100644 --- a/tbx/blog/migrations/0002_remove_blogindexpage_call_to_action_and_more.py +++ b/tbx/blog/migrations/0002_remove_blogindexpage_call_to_action_and_more.py @@ -1,17 +1,19 @@ # Generated by Django 4.2.9 on 2024-01-15 10:16 from django.db import migrations -import tbx.core.blocks + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks +import tbx.core.blocks -class Migration(migrations.Migration): +class Migration(migrations.Migration): dependencies = [ ("blog", "0001_initial"), ] diff --git a/tbx/blog/migrations/0003_add_new_image_block_to_body_streamfield.py b/tbx/blog/migrations/0003_add_new_image_block_to_body_streamfield.py index a4d7a8b46..5fd5d3273 100644 --- a/tbx/blog/migrations/0003_add_new_image_block_to_body_streamfield.py +++ b/tbx/blog/migrations/0003_add_new_image_block_to_body_streamfield.py @@ -1,16 +1,17 @@ # Generated by Django 4.2.9 on 2024-01-15 11:14 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("blog", "0002_remove_blogindexpage_call_to_action_and_more"), ] diff --git a/tbx/blog/migrations/0003_alter_blogpage_body.py b/tbx/blog/migrations/0003_alter_blogpage_body.py index 796b864b8..36121db5a 100644 --- a/tbx/blog/migrations/0003_alter_blogpage_body.py +++ b/tbx/blog/migrations/0003_alter_blogpage_body.py @@ -1,17 +1,19 @@ # Generated by Django 4.2.9 on 2024-01-15 12:25 from django.db import migrations -import tbx.core.blocks + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks +import tbx.core.blocks -class Migration(migrations.Migration): +class Migration(migrations.Migration): dependencies = [ ("blog", "0002_remove_blogindexpage_call_to_action_and_more"), ] diff --git a/tbx/blog/migrations/0004_alter_blogpage_body.py b/tbx/blog/migrations/0004_alter_blogpage_body.py index 30887545a..5fb083337 100644 --- a/tbx/blog/migrations/0004_alter_blogpage_body.py +++ b/tbx/blog/migrations/0004_alter_blogpage_body.py @@ -1,17 +1,19 @@ # Generated by Django 4.2.9 on 2024-01-16 13:44 from django.db import migrations -import tbx.core.blocks + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks +import tbx.core.blocks -class Migration(migrations.Migration): +class Migration(migrations.Migration): dependencies = [ ("blog", "0003_alter_blogpage_body"), ] diff --git a/tbx/blog/migrations/0004_data_migration_aligned_and_wide_images.py b/tbx/blog/migrations/0004_data_migration_aligned_and_wide_images.py index b5d25336f..2a0291af4 100644 --- a/tbx/blog/migrations/0004_data_migration_aligned_and_wide_images.py +++ b/tbx/blog/migrations/0004_data_migration_aligned_and_wide_images.py @@ -1,6 +1,7 @@ # Generated by Django 4.2.9 on 2024-01-15 11:15 from django.db import migrations + from wagtail.blocks.migrations.migrate_operation import MigrateStreamData from wagtail.blocks.migrations.operations import RenameStreamChildrenOperation diff --git a/tbx/blog/migrations/0005_remove_aligned_and_wide_image_blocks_from_body_streamfield.py b/tbx/blog/migrations/0005_remove_aligned_and_wide_image_blocks_from_body_streamfield.py index 99eb1cb42..a81a2760f 100644 --- a/tbx/blog/migrations/0005_remove_aligned_and_wide_image_blocks_from_body_streamfield.py +++ b/tbx/blog/migrations/0005_remove_aligned_and_wide_image_blocks_from_body_streamfield.py @@ -1,16 +1,17 @@ # Generated by Django 4.2.9 on 2024-01-15 11:53 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("blog", "0004_data_migration_aligned_and_wide_images"), ] diff --git a/tbx/blog/migrations/0006_merge_20240117_1530.py b/tbx/blog/migrations/0006_merge_20240117_1530.py index a69c4290c..aee6c4aba 100644 --- a/tbx/blog/migrations/0006_merge_20240117_1530.py +++ b/tbx/blog/migrations/0006_merge_20240117_1530.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("blog", "0004_alter_blogpage_body"), ("blog", "0005_remove_aligned_and_wide_image_blocks_from_body_streamfield"), diff --git a/tbx/blog/migrations/0007_alter_blogpage_body.py b/tbx/blog/migrations/0007_alter_blogpage_body.py index cb0024a88..bb60cfc64 100644 --- a/tbx/blog/migrations/0007_alter_blogpage_body.py +++ b/tbx/blog/migrations/0007_alter_blogpage_body.py @@ -1,16 +1,17 @@ # Generated by Django 4.2.9 on 2024-01-18 13:49 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("blog", "0006_merge_20240117_1530"), ] diff --git a/tbx/blog/migrations/0008_alter_blogpage_body.py b/tbx/blog/migrations/0008_alter_blogpage_body.py index a3965f54d..612a79463 100644 --- a/tbx/blog/migrations/0008_alter_blogpage_body.py +++ b/tbx/blog/migrations/0008_alter_blogpage_body.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-01-18 14:11 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("blog", "0007_alter_blogpage_body"), ] diff --git a/tbx/blog/migrations/0009_delete_blogpagerelatedlink.py b/tbx/blog/migrations/0009_delete_blogpagerelatedlink.py index c66c010f6..880b88457 100644 --- a/tbx/blog/migrations/0009_delete_blogpagerelatedlink.py +++ b/tbx/blog/migrations/0009_delete_blogpagerelatedlink.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("blog", "0008_alter_blogpage_body"), ] diff --git a/tbx/blog/migrations/0010_add_help_text_to_alt_text_field_in_image_block.py b/tbx/blog/migrations/0010_add_help_text_to_alt_text_field_in_image_block.py index 70626fd1d..7bc385261 100644 --- a/tbx/blog/migrations/0010_add_help_text_to_alt_text_field_in_image_block.py +++ b/tbx/blog/migrations/0010_add_help_text_to_alt_text_field_in_image_block.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-01-19 13:09 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("blog", "0009_delete_blogpagerelatedlink"), ] diff --git a/tbx/blog/migrations/0011_remove_blogpagetagselect_page_and_more.py b/tbx/blog/migrations/0011_remove_blogpagetagselect_page_and_more.py index eac900a1d..5ef7e2d27 100644 --- a/tbx/blog/migrations/0011_remove_blogpagetagselect_page_and_more.py +++ b/tbx/blog/migrations/0011_remove_blogpagetagselect_page_and_more.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("blog", "0010_add_help_text_to_alt_text_field_in_image_block"), ] diff --git a/tbx/blog/migrations/0012_alter_blogpage_body.py b/tbx/blog/migrations/0012_alter_blogpage_body.py index 2bde8ed8e..291f8f350 100644 --- a/tbx/blog/migrations/0012_alter_blogpage_body.py +++ b/tbx/blog/migrations/0012_alter_blogpage_body.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-01-24 10:12 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("blog", "0011_remove_blogpagetagselect_page_and_more"), ] diff --git a/tbx/blog/migrations/0012_alter_blogpageauthor_page.py b/tbx/blog/migrations/0012_alter_blogpageauthor_page.py index 2d3b4241e..24dad3ce2 100644 --- a/tbx/blog/migrations/0012_alter_blogpageauthor_page.py +++ b/tbx/blog/migrations/0012_alter_blogpageauthor_page.py @@ -2,11 +2,11 @@ from django.db import migrations import django.db.models.deletion + import modelcluster.fields class Migration(migrations.Migration): - dependencies = [ ("blog", "0011_remove_blogpagetagselect_page_and_more"), ] diff --git a/tbx/blog/migrations/0014_delete_blogpageauthor.py b/tbx/blog/migrations/0014_delete_blogpageauthor.py index d266f5736..25698c057 100644 --- a/tbx/blog/migrations/0014_delete_blogpageauthor.py +++ b/tbx/blog/migrations/0014_delete_blogpageauthor.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("blog", "0013_data_migration_page_authors"), ] diff --git a/tbx/blog/migrations/0015_merge_20240126_0816.py b/tbx/blog/migrations/0015_merge_20240126_0816.py index 2c288b74f..c2b188e93 100644 --- a/tbx/blog/migrations/0015_merge_20240126_0816.py +++ b/tbx/blog/migrations/0015_merge_20240126_0816.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("blog", "0012_alter_blogpage_body"), ("blog", "0014_delete_blogpageauthor"), diff --git a/tbx/blog/migrations/0016_alter_blogpage_body.py b/tbx/blog/migrations/0016_alter_blogpage_body.py index 26ac054f3..fbe91dc17 100644 --- a/tbx/blog/migrations/0016_alter_blogpage_body.py +++ b/tbx/blog/migrations/0016_alter_blogpage_body.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-01-26 10:39 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("blog", "0015_merge_20240126_0816"), ] diff --git a/tbx/blog/migrations/0017_blogindexpage_theme_blogpage_theme.py b/tbx/blog/migrations/0017_blogindexpage_theme_blogpage_theme.py index 9c0c5ef6d..2ca0e86e1 100644 --- a/tbx/blog/migrations/0017_blogindexpage_theme_blogpage_theme.py +++ b/tbx/blog/migrations/0017_blogindexpage_theme_blogpage_theme.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("blog", "0016_alter_blogpage_body"), ] diff --git a/tbx/blog/migrations/0018_blogpage_related_sectors.py b/tbx/blog/migrations/0018_blogpage_related_sectors.py index bb4c58fe9..251ca6931 100644 --- a/tbx/blog/migrations/0018_blogpage_related_sectors.py +++ b/tbx/blog/migrations/0018_blogpage_related_sectors.py @@ -1,11 +1,11 @@ # Generated by Django 4.2.9 on 2024-02-06 10:33 from django.db import migrations + import modelcluster.fields class Migration(migrations.Migration): - dependencies = [ ("taxonomy", "0002_sector_team_remove_service_contact_reasons_and_more"), ("blog", "0017_blogindexpage_theme_blogpage_theme"), diff --git a/tbx/blog/migrations/0019_add_contact_mixin_to_all_page_models.py b/tbx/blog/migrations/0019_add_contact_mixin_to_all_page_models.py index 8278fe334..91c033d6a 100644 --- a/tbx/blog/migrations/0019_add_contact_mixin_to_all_page_models.py +++ b/tbx/blog/migrations/0019_add_contact_mixin_to_all_page_models.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("people", "0006_add_contact_mixin_to_all_page_models"), ("blog", "0018_blogpage_related_sectors"), diff --git a/tbx/blog/migrations/0020_alter_blogpage_related_sectors.py b/tbx/blog/migrations/0020_alter_blogpage_related_sectors.py index aecb2440b..a6e04de56 100644 --- a/tbx/blog/migrations/0020_alter_blogpage_related_sectors.py +++ b/tbx/blog/migrations/0020_alter_blogpage_related_sectors.py @@ -1,11 +1,11 @@ # Generated by Django 4.2.9 on 2024-02-19 14:46 from django.db import migrations + import modelcluster.fields class Migration(migrations.Migration): - dependencies = [ ("taxonomy", "0002_sector_team_remove_service_contact_reasons_and_more"), ("blog", "0019_add_contact_mixin_to_all_page_models"), diff --git a/tbx/blog/migrations/0021_alter_blogpage_body.py b/tbx/blog/migrations/0021_alter_blogpage_body.py index 996e44a86..5b64a4a30 100644 --- a/tbx/blog/migrations/0021_alter_blogpage_body.py +++ b/tbx/blog/migrations/0021_alter_blogpage_body.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-02-26 09:50 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("blog", "0020_alter_blogpage_related_sectors"), ] diff --git a/tbx/blog/migrations/0022_add_wide_image_block.py b/tbx/blog/migrations/0022_add_wide_image_block.py index b6917ea38..0d6792b43 100644 --- a/tbx/blog/migrations/0022_add_wide_image_block.py +++ b/tbx/blog/migrations/0022_add_wide_image_block.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-02-27 14:14 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("blog", "0021_alter_blogpage_body"), ] diff --git a/tbx/blog/migrations/0023_add_wide_image_block.py b/tbx/blog/migrations/0023_add_wide_image_block.py index f32a9785f..a1ffa8c5f 100644 --- a/tbx/blog/migrations/0023_add_wide_image_block.py +++ b/tbx/blog/migrations/0023_add_wide_image_block.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-02-28 08:44 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("blog", "0022_add_wide_image_block"), ] diff --git a/tbx/blog/migrations/0024_use_custom_streamfield.py b/tbx/blog/migrations/0024_use_custom_streamfield.py index 77472d132..7136e47a8 100644 --- a/tbx/blog/migrations/0024_use_custom_streamfield.py +++ b/tbx/blog/migrations/0024_use_custom_streamfield.py @@ -1,11 +1,11 @@ # Generated by Django 4.2.9 on 2024-03-11 19:43 from django.db import migrations + import tbx.core.utils.fields class Migration(migrations.Migration): - dependencies = [ ("blog", "0023_add_wide_image_block"), ] diff --git a/tbx/blog/migrations/0025_add_navigation_title_override.py b/tbx/blog/migrations/0025_add_navigation_title_override.py index 54eacaa78..976ef173b 100644 --- a/tbx/blog/migrations/0025_add_navigation_title_override.py +++ b/tbx/blog/migrations/0025_add_navigation_title_override.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("blog", "0024_use_custom_streamfield"), ] diff --git a/tbx/blog/migrations/0026_add_earth_colour_theme.py b/tbx/blog/migrations/0026_add_earth_colour_theme.py index 9b6fd0105..308e9857d 100644 --- a/tbx/blog/migrations/0026_add_earth_colour_theme.py +++ b/tbx/blog/migrations/0026_add_earth_colour_theme.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("blog", "0025_add_navigation_title_override"), ] diff --git a/tbx/blog/models.py b/tbx/blog/models.py index 325a1e228..f75dda0bc 100644 --- a/tbx/blog/models.py +++ b/tbx/blog/models.py @@ -1,6 +1,6 @@ +from itertools import chain import math import string -from itertools import chain from django import forms from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator @@ -10,8 +10,14 @@ from django.utils.functional import cached_property from django.utils.http import urlencode -from bs4 import BeautifulSoup from modelcluster.fields import ParentalManyToManyField +from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel +from wagtail.models import Page +from wagtail.search import index +from wagtail.signals import page_published + +from bs4 import BeautifulSoup + from tbx.core.blocks import StoryBlock from tbx.core.utils.fields import StreamField from tbx.core.utils.models import ( @@ -22,10 +28,6 @@ from tbx.images.models import CustomImage from tbx.people.models import ContactMixin from tbx.taxonomy.models import Sector, Service -from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel -from wagtail.models import Page -from wagtail.search import index -from wagtail.signals import page_published class BlogIndexPage( diff --git a/tbx/blog/tests/test_models.py b/tbx/blog/tests/test_models.py index 569338039..4b73e8202 100644 --- a/tbx/blog/tests/test_models.py +++ b/tbx/blog/tests/test_models.py @@ -1,12 +1,15 @@ from django.core.paginator import Page as PaginatorPage +from wagtail.coreutils import get_dummy_request +from wagtail.models import PageViewRestriction +from wagtail.test.utils import WagtailPageTestCase + from faker import Faker + from tbx.blog.factories import BlogIndexPageFactory, BlogPageFactory from tbx.blog.models import BlogPage from tbx.taxonomy.factories import SectorFactory, ServiceFactory -from wagtail.coreutils import get_dummy_request -from wagtail.models import PageViewRestriction -from wagtail.test.utils import WagtailPageTestCase + fake = Faker(["en_GB"]) @@ -25,14 +28,12 @@ def setUpTestData(cls): PageViewRestriction.objects.create( page=cls.private_blog_post, restriction_type="password", - password="password123", + password="password123", # noqa: S106 ) def test_get_context(self): context = self.blog_index.get_context(get_dummy_request()) blog_posts = context["blog_posts"] - print("blog_posts") - print(blog_posts) self.assertIsInstance(blog_posts, PaginatorPage) self.assertEqual(blog_posts.object_list.first(), self.blog_post) diff --git a/tbx/core/blocks.py b/tbx/core/blocks.py index 9c013c2de..3cdb0c4aa 100644 --- a/tbx/core/blocks.py +++ b/tbx/core/blocks.py @@ -1,6 +1,6 @@ -import logging from collections import defaultdict from datetime import datetime +import logging from django.core.exceptions import ValidationError from django.db import models @@ -9,7 +9,6 @@ from django.utils.functional import cached_property from django.utils.safestring import mark_safe -from tbx.images.models import CustomImage from wagtail import blocks from wagtail.blocks.struct_block import StructBlockValidationError from wagtail.contrib.typed_table_block.blocks import ( @@ -22,9 +21,13 @@ from wagtail.images.blocks import ImageChooserBlock from wagtail.models import Page from wagtail.snippets.blocks import SnippetChooserBlock + from wagtailmarkdown.blocks import MarkdownBlock from wagtailmedia.blocks import VideoChooserBlock +from tbx.images.models import CustomImage + + logger = logging.getLogger(__name__) @@ -101,8 +104,6 @@ class ImageFormatChoiceBlock(blocks.FieldBlock): See https://github.com/wagtail/wagtail/issues/3710 for more details. """ - pass - class AltTextStructValue(blocks.StructValue): def image_alt_text(self): @@ -373,22 +374,23 @@ def featured_case_study_logo(self): """ if logo := self.get("logo"): return logo - elif page := self.get("link"): - if page.content_type.model_class().__name__ == "WorkPage": - return page.specific.logo + elif ( + page := self.get("link") + ) and page.content_type.model_class().__name__ == "WorkPage": + return page.specific.logo return None class NumericResultBlock(blocks.StructBlock): label = blocks.CharBlock( max_length=255, - help_text=mark_safe( + help_text=mark_safe( # noqa: S308 "Short text to describe the change e.g. Raised over" ), ) headline_number = blocks.CharBlock( max_length=255, - help_text=mark_safe("A numerical value e.g. £600k"), + help_text=mark_safe("A numerical value e.g. £600k"), # noqa: S308 ) @@ -629,7 +631,7 @@ def clean(self, value): result = super().clean(value) errors = {} - for i in range(0, len(result)): + for i in range(len(result)): button_values = { "button_link": result[i]["button_link"], "button_text": result[i]["button_text"], @@ -796,16 +798,16 @@ class Meta: class NumericStatisticsBlock(blocks.StructBlock): headline_number = blocks.CharBlock( max_length=255, - help_text=mark_safe("A numerical value e.g. 30%"), + help_text=mark_safe("A numerical value e.g. 30%"), # noqa: S308 ) description = blocks.TextBlock( - help_text=mark_safe( + help_text=mark_safe( # noqa: S308 "Text to describe the change e.g. Reduction in accessibility errors" ) ) further_details = blocks.TextBlock( required=False, - help_text=mark_safe( + help_text=mark_safe( # noqa: S308 "Text to give more information, e.g. Over 80% of pages" ), ) @@ -817,13 +819,13 @@ class Meta: class TextualStatisticsBlock(blocks.StructBlock): headline_text = blocks.CharBlock( max_length=255, - help_text=mark_safe( + help_text=mark_safe( # noqa: S308 "Describe a general improvement, e.g. Reduction in accessibility issues" ), ) further_details = blocks.TextBlock( required=False, - help_text=mark_safe( + help_text=mark_safe( # noqa: S308 "Text to give more information, e.g. Over 80% of pages" ), ) diff --git a/tbx/core/context_processors.py b/tbx/core/context_processors.py index b0c37514f..e8966730a 100644 --- a/tbx/core/context_processors.py +++ b/tbx/core/context_processors.py @@ -6,7 +6,6 @@ def global_vars(request): - # Read the mode cookie to determine the user's saved preference for light or dark mode, if it exists # Ensure it is one of the allowed values mode = request.COOKIES.get("torchbox-mode", "dark") diff --git a/tbx/core/errors.py b/tbx/core/errors.py index 5a5a6cebe..d2cd5687a 100644 --- a/tbx/core/errors.py +++ b/tbx/core/errors.py @@ -1,4 +1,2 @@ class UnauthorizedHTTPError(Exception): """Raised when the user is not authorized to access a resource and the request accepts HTML.""" - - pass diff --git a/tbx/core/factories.py b/tbx/core/factories.py index ef7cf28b6..41da713c2 100644 --- a/tbx/core/factories.py +++ b/tbx/core/factories.py @@ -1,8 +1,10 @@ +from wagtail.blocks import RichTextBlock + import factory import wagtail_factories + from tbx.core.blocks import StoryBlock from tbx.core.models import HomePage, StandardPage -from wagtail.blocks import RichTextBlock class RichTextBlockFactory(wagtail_factories.blocks.BlockFactory): diff --git a/tbx/core/fields.py b/tbx/core/fields.py index 3832c17d2..41d0ea834 100644 --- a/tbx/core/fields.py +++ b/tbx/core/fields.py @@ -4,6 +4,7 @@ from django.db import models from django.utils.translation import gettext_lazy as _ + color_re = re.compile(r"^[A-Fa-f0-9]{6}$") color_validator = RegexValidator(color_re, _("Enter a valid color."), "invalid") diff --git a/tbx/core/management/commands/update_youtube_embeds.py b/tbx/core/management/commands/update_youtube_embeds.py index 464c359fa..cb9703e27 100644 --- a/tbx/core/management/commands/update_youtube_embeds.py +++ b/tbx/core/management/commands/update_youtube_embeds.py @@ -6,6 +6,7 @@ from wagtail.embeds.exceptions import EmbedException from wagtail.embeds.models import Embed + logger = logging.getLogger(__name__) @@ -17,7 +18,6 @@ class Command(BaseCommand): """ def handle(self, *args, **options): - youtube_embeds = Embed.objects.filter(provider_name="YouTube") urls = list(youtube_embeds.values_list("url", flat=True)) diff --git a/tbx/core/migrations/0001_initial.py b/tbx/core/migrations/0001_initial.py index d79ea4107..c29e13798 100644 --- a/tbx/core/migrations/0001_initial.py +++ b/tbx/core/migrations/0001_initial.py @@ -2,19 +2,21 @@ from django.db import migrations, models import django.db.models.deletion + import modelcluster.fields -import tbx.core.blocks -import tbx.core.fields import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks +import tbx.core.blocks +import tbx.core.fields -class Migration(migrations.Migration): +class Migration(migrations.Migration): initial = True dependencies = [ diff --git a/tbx/core/migrations/0002_remove_jobindexpagejob_page_delete_jobindexpage_and_more.py b/tbx/core/migrations/0002_remove_jobindexpagejob_page_delete_jobindexpage_and_more.py index a0fc78102..036543426 100644 --- a/tbx/core/migrations/0002_remove_jobindexpagejob_page_delete_jobindexpage_and_more.py +++ b/tbx/core/migrations/0002_remove_jobindexpagejob_page_delete_jobindexpage_and_more.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0001_initial"), ] diff --git a/tbx/core/migrations/0003_remove_standardpage_additional_content_and_more.py b/tbx/core/migrations/0003_remove_standardpage_additional_content_and_more.py index 65aaed460..f2471ccb4 100644 --- a/tbx/core/migrations/0003_remove_standardpage_additional_content_and_more.py +++ b/tbx/core/migrations/0003_remove_standardpage_additional_content_and_more.py @@ -1,17 +1,19 @@ # Generated by Django 4.2.8 on 2024-01-11 11:47 from django.db import migrations -import tbx.core.blocks + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks +import tbx.core.blocks -class Migration(migrations.Migration): +class Migration(migrations.Migration): dependencies = [ ("torchbox", "0002_remove_jobindexpagejob_page_delete_jobindexpage_and_more"), ] diff --git a/tbx/core/migrations/0004_alter_standardpage_body.py b/tbx/core/migrations/0004_alter_standardpage_body.py index 0977376f6..329ca51e4 100644 --- a/tbx/core/migrations/0004_alter_standardpage_body.py +++ b/tbx/core/migrations/0004_alter_standardpage_body.py @@ -1,17 +1,19 @@ # Generated by Django 4.2.8 on 2024-01-11 14:35 from django.db import migrations -import tbx.core.blocks + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks +import tbx.core.blocks -class Migration(migrations.Migration): +class Migration(migrations.Migration): dependencies = [ ("torchbox", "0003_remove_standardpage_additional_content_and_more"), ] diff --git a/tbx/core/migrations/0005_remove_advert_page_remove_advertplacement_advert_and_more.py b/tbx/core/migrations/0005_remove_advert_page_remove_advertplacement_advert_and_more.py index fb0ea86b2..f075fd0a8 100644 --- a/tbx/core/migrations/0005_remove_advert_page_remove_advertplacement_advert_and_more.py +++ b/tbx/core/migrations/0005_remove_advert_page_remove_advertplacement_advert_and_more.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0004_alter_standardpage_body"), ] diff --git a/tbx/core/migrations/0006_add_new_image_block_to_body_streamfield.py b/tbx/core/migrations/0006_add_new_image_block_to_body_streamfield.py index cbf9bb7ef..efe753856 100644 --- a/tbx/core/migrations/0006_add_new_image_block_to_body_streamfield.py +++ b/tbx/core/migrations/0006_add_new_image_block_to_body_streamfield.py @@ -1,16 +1,17 @@ # Generated by Django 4.2.9 on 2024-01-15 11:14 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0005_remove_advert_page_remove_advertplacement_advert_and_more"), ] diff --git a/tbx/core/migrations/0006_alter_standardpage_body.py b/tbx/core/migrations/0006_alter_standardpage_body.py index 14eac8e04..b9e4d7790 100644 --- a/tbx/core/migrations/0006_alter_standardpage_body.py +++ b/tbx/core/migrations/0006_alter_standardpage_body.py @@ -1,17 +1,19 @@ # Generated by Django 4.2.9 on 2024-01-15 12:42 from django.db import migrations -import tbx.core.blocks + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks +import tbx.core.blocks -class Migration(migrations.Migration): +class Migration(migrations.Migration): dependencies = [ ("torchbox", "0005_remove_advert_page_remove_advertplacement_advert_and_more"), ] diff --git a/tbx/core/migrations/0007_alter_standardpage_body.py b/tbx/core/migrations/0007_alter_standardpage_body.py index 1408cf2f2..e3b70c76e 100644 --- a/tbx/core/migrations/0007_alter_standardpage_body.py +++ b/tbx/core/migrations/0007_alter_standardpage_body.py @@ -1,17 +1,19 @@ # Generated by Django 4.2.9 on 2024-01-16 13:44 from django.db import migrations -import tbx.core.blocks + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks +import tbx.core.blocks -class Migration(migrations.Migration): +class Migration(migrations.Migration): dependencies = [ ("torchbox", "0006_alter_standardpage_body"), ] diff --git a/tbx/core/migrations/0007_data_migration_aligned_and_wide_images.py b/tbx/core/migrations/0007_data_migration_aligned_and_wide_images.py index 0e804e9fa..ab3bdee1c 100644 --- a/tbx/core/migrations/0007_data_migration_aligned_and_wide_images.py +++ b/tbx/core/migrations/0007_data_migration_aligned_and_wide_images.py @@ -1,6 +1,7 @@ # Generated by Django 4.2.9 on 2024-01-15 11:15 from django.db import migrations + from wagtail.blocks.migrations.migrate_operation import MigrateStreamData from wagtail.blocks.migrations.operations import RenameStreamChildrenOperation diff --git a/tbx/core/migrations/0008_remove_aligned_and_wide_image_blocks_from_body_streamfield.py b/tbx/core/migrations/0008_remove_aligned_and_wide_image_blocks_from_body_streamfield.py index d1677244d..0348fea82 100644 --- a/tbx/core/migrations/0008_remove_aligned_and_wide_image_blocks_from_body_streamfield.py +++ b/tbx/core/migrations/0008_remove_aligned_and_wide_image_blocks_from_body_streamfield.py @@ -1,16 +1,17 @@ # Generated by Django 4.2.9 on 2024-01-15 11:53 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0007_data_migration_aligned_and_wide_images"), ] diff --git a/tbx/core/migrations/0009_merge_20240117_1530.py b/tbx/core/migrations/0009_merge_20240117_1530.py index 9db6240c0..91f55c517 100644 --- a/tbx/core/migrations/0009_merge_20240117_1530.py +++ b/tbx/core/migrations/0009_merge_20240117_1530.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0007_alter_standardpage_body"), ("torchbox", "0008_remove_aligned_and_wide_image_blocks_from_body_streamfield"), diff --git a/tbx/core/migrations/0010_alter_standardpage_body.py b/tbx/core/migrations/0010_alter_standardpage_body.py index ff6ade62a..c86a02b4f 100644 --- a/tbx/core/migrations/0010_alter_standardpage_body.py +++ b/tbx/core/migrations/0010_alter_standardpage_body.py @@ -1,16 +1,17 @@ # Generated by Django 4.2.9 on 2024-01-17 15:31 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0009_merge_20240117_1530"), ] diff --git a/tbx/core/migrations/0011_alter_standardpage_body.py b/tbx/core/migrations/0011_alter_standardpage_body.py index 17ca108da..54808705f 100644 --- a/tbx/core/migrations/0011_alter_standardpage_body.py +++ b/tbx/core/migrations/0011_alter_standardpage_body.py @@ -1,16 +1,17 @@ # Generated by Django 4.2.9 on 2024-01-18 13:49 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0010_alter_standardpage_body"), ] diff --git a/tbx/core/migrations/0012_alter_standardpage_body.py b/tbx/core/migrations/0012_alter_standardpage_body.py index 6050e2570..4a1ca93c4 100644 --- a/tbx/core/migrations/0012_alter_standardpage_body.py +++ b/tbx/core/migrations/0012_alter_standardpage_body.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-01-18 14:11 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0011_alter_standardpage_body"), ] diff --git a/tbx/core/migrations/0013_add_help_text_to_alt_text_field_in_image_block.py b/tbx/core/migrations/0013_add_help_text_to_alt_text_field_in_image_block.py index d799a5402..7579a6d3e 100644 --- a/tbx/core/migrations/0013_add_help_text_to_alt_text_field_in_image_block.py +++ b/tbx/core/migrations/0013_add_help_text_to_alt_text_field_in_image_block.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-01-19 13:09 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0012_alter_standardpage_body"), ] diff --git a/tbx/core/migrations/0014_alter_standardpage_body.py b/tbx/core/migrations/0014_alter_standardpage_body.py index c391e85c5..d41eab847 100644 --- a/tbx/core/migrations/0014_alter_standardpage_body.py +++ b/tbx/core/migrations/0014_alter_standardpage_body.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-01-24 10:12 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0013_add_help_text_to_alt_text_field_in_image_block"), ] diff --git a/tbx/core/migrations/0014_data_migration_pageauthor.py b/tbx/core/migrations/0014_data_migration_pageauthor.py index 4d691cb11..d15a3a2d9 100644 --- a/tbx/core/migrations/0014_data_migration_pageauthor.py +++ b/tbx/core/migrations/0014_data_migration_pageauthor.py @@ -2,11 +2,11 @@ from django.db import migrations, models import django.db.models.deletion + import modelcluster.fields class Migration(migrations.Migration): - dependencies = [ ("people", "0003_remove_personindexpage_call_to_action_and_more"), ("wagtailcore", "0089_log_entry_data_json_null_to_object"), diff --git a/tbx/core/migrations/0015_merge_20240126_0816.py b/tbx/core/migrations/0015_merge_20240126_0816.py index 2351ade2e..b5d3bba66 100644 --- a/tbx/core/migrations/0015_merge_20240126_0816.py +++ b/tbx/core/migrations/0015_merge_20240126_0816.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0014_alter_standardpage_body"), ("torchbox", "0014_data_migration_pageauthor"), diff --git a/tbx/core/migrations/0016_alter_standardpage_body.py b/tbx/core/migrations/0016_alter_standardpage_body.py index 332fca6a4..1f1266f86 100644 --- a/tbx/core/migrations/0016_alter_standardpage_body.py +++ b/tbx/core/migrations/0016_alter_standardpage_body.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-01-26 10:39 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0015_merge_20240126_0816"), ] diff --git a/tbx/core/migrations/0017_homepage_theme_standardpage_theme.py b/tbx/core/migrations/0017_homepage_theme_standardpage_theme.py index 1881a5c38..4554d9f3f 100644 --- a/tbx/core/migrations/0017_homepage_theme_standardpage_theme.py +++ b/tbx/core/migrations/0017_homepage_theme_standardpage_theme.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0016_alter_standardpage_body"), ] diff --git a/tbx/core/migrations/0018_add_contact_mixin_to_all_page_models.py b/tbx/core/migrations/0018_add_contact_mixin_to_all_page_models.py index 6871403ac..ddc25bd47 100644 --- a/tbx/core/migrations/0018_add_contact_mixin_to_all_page_models.py +++ b/tbx/core/migrations/0018_add_contact_mixin_to_all_page_models.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("people", "0006_add_contact_mixin_to_all_page_models"), ("torchbox", "0017_homepage_theme_standardpage_theme"), diff --git a/tbx/core/migrations/0019_alter_standardpage_body.py b/tbx/core/migrations/0019_alter_standardpage_body.py index c06f1f72a..72d3ab062 100644 --- a/tbx/core/migrations/0019_alter_standardpage_body.py +++ b/tbx/core/migrations/0019_alter_standardpage_body.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-02-26 09:50 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0018_add_contact_mixin_to_all_page_models"), ] diff --git a/tbx/core/migrations/0020_homepagepartnerlogo_remove_homepageheroimage_image_and_more.py b/tbx/core/migrations/0020_homepagepartnerlogo_remove_homepageheroimage_image_and_more.py index 65d30a4c3..581256307 100644 --- a/tbx/core/migrations/0020_homepagepartnerlogo_remove_homepageheroimage_image_and_more.py +++ b/tbx/core/migrations/0020_homepagepartnerlogo_remove_homepageheroimage_image_and_more.py @@ -2,18 +2,19 @@ from django.db import migrations, models import django.db.models.deletion + import modelcluster.fields import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("images", "0001_initial"), ("torchbox", "0019_alter_standardpage_body"), diff --git a/tbx/core/migrations/0021_update_label_names.py b/tbx/core/migrations/0021_update_label_names.py index 96984e1df..60022172f 100644 --- a/tbx/core/migrations/0021_update_label_names.py +++ b/tbx/core/migrations/0021_update_label_names.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-02-26 16:31 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ( "torchbox", diff --git a/tbx/core/migrations/0022_add_promo_block_to_homepage_body.py b/tbx/core/migrations/0022_add_promo_block_to_homepage_body.py index 73557f727..6c4fd3c2e 100644 --- a/tbx/core/migrations/0022_add_promo_block_to_homepage_body.py +++ b/tbx/core/migrations/0022_add_promo_block_to_homepage_body.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-02-27 10:25 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0021_update_label_names"), ] diff --git a/tbx/core/migrations/0023_add_wide_image_block.py b/tbx/core/migrations/0023_add_wide_image_block.py index bdebfa809..483435834 100644 --- a/tbx/core/migrations/0023_add_wide_image_block.py +++ b/tbx/core/migrations/0023_add_wide_image_block.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-02-27 14:14 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0022_add_promo_block_to_homepage_body"), ] diff --git a/tbx/core/migrations/0024_add_wide_image_block.py b/tbx/core/migrations/0024_add_wide_image_block.py index 6731781ac..670108476 100644 --- a/tbx/core/migrations/0024_add_wide_image_block.py +++ b/tbx/core/migrations/0024_add_wide_image_block.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-02-28 08:44 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0023_add_wide_image_block"), ] diff --git a/tbx/core/migrations/0025_add_tabbed_paragraph_block.py b/tbx/core/migrations/0025_add_tabbed_paragraph_block.py index 69c281704..22717a301 100644 --- a/tbx/core/migrations/0025_add_tabbed_paragraph_block.py +++ b/tbx/core/migrations/0025_add_tabbed_paragraph_block.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-02-29 08:09 from django.db import migrations + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0024_add_wide_image_block"), ] diff --git a/tbx/core/migrations/0026_add_event_block_to_homepage_body.py b/tbx/core/migrations/0026_add_event_block_to_homepage_body.py index 4e9dc8aee..999d8a1a2 100644 --- a/tbx/core/migrations/0026_add_event_block_to_homepage_body.py +++ b/tbx/core/migrations/0026_add_event_block_to_homepage_body.py @@ -1,17 +1,18 @@ # Generated by Django 4.2.9 on 2024-02-29 09:01 from django.db import migrations, models + import wagtail.blocks import wagtail.embeds.blocks import wagtail.fields import wagtail.images.blocks import wagtail.snippets.blocks + import wagtailmarkdown.blocks import wagtailmedia.blocks class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0025_add_tabbed_paragraph_block"), ] diff --git a/tbx/core/migrations/0027_remove_unneeded_homepage_field.py b/tbx/core/migrations/0027_remove_unneeded_homepage_field.py index cc9e39398..30a928646 100644 --- a/tbx/core/migrations/0027_remove_unneeded_homepage_field.py +++ b/tbx/core/migrations/0027_remove_unneeded_homepage_field.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0026_add_event_block_to_homepage_body"), ] diff --git a/tbx/core/migrations/0028_remove_unwanted_blocks_on_homepage.py b/tbx/core/migrations/0028_remove_unwanted_blocks_on_homepage.py index d58979a77..91b5fc89a 100644 --- a/tbx/core/migrations/0028_remove_unwanted_blocks_on_homepage.py +++ b/tbx/core/migrations/0028_remove_unwanted_blocks_on_homepage.py @@ -1,6 +1,7 @@ # Generated by Django 4.2.9 on 2024-03-04 15:22 from django.db import migrations + import wagtail.blocks import wagtail.fields import wagtail.images.blocks @@ -8,7 +9,6 @@ class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0027_remove_unneeded_homepage_field"), ] diff --git a/tbx/core/migrations/0029_update_button_link_on_photocollageblock.py b/tbx/core/migrations/0029_update_button_link_on_photocollageblock.py index aed6ca19e..ed25cb903 100644 --- a/tbx/core/migrations/0029_update_button_link_on_photocollageblock.py +++ b/tbx/core/migrations/0029_update_button_link_on_photocollageblock.py @@ -1,6 +1,7 @@ # Generated by Django 4.2.9 on 2024-03-05 18:53 from django.db import migrations + import wagtail.blocks import wagtail.fields import wagtail.images.blocks @@ -8,7 +9,6 @@ class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0028_remove_unwanted_blocks_on_homepage"), ] diff --git a/tbx/core/migrations/0030_remove_featured_case_study_tagline.py b/tbx/core/migrations/0030_remove_featured_case_study_tagline.py index 76567f69a..6b938d127 100644 --- a/tbx/core/migrations/0030_remove_featured_case_study_tagline.py +++ b/tbx/core/migrations/0030_remove_featured_case_study_tagline.py @@ -1,6 +1,7 @@ # Generated by Django 4.2.9 on 2024-03-11 12:55 from django.db import migrations + import wagtail.blocks import wagtail.fields import wagtail.images.blocks @@ -8,7 +9,6 @@ class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0029_update_button_link_on_photocollageblock"), ] diff --git a/tbx/core/migrations/0030_use_custom_streamfield.py b/tbx/core/migrations/0030_use_custom_streamfield.py index 78bf82fc4..06e7e259d 100644 --- a/tbx/core/migrations/0030_use_custom_streamfield.py +++ b/tbx/core/migrations/0030_use_custom_streamfield.py @@ -1,11 +1,11 @@ # Generated by Django 4.2.9 on 2024-03-11 19:43 from django.db import migrations + import tbx.core.utils.fields class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0029_update_button_link_on_photocollageblock"), ] diff --git a/tbx/core/migrations/0031_merge_20240315_1052.py b/tbx/core/migrations/0031_merge_20240315_1052.py index c157677b3..f82da5dab 100644 --- a/tbx/core/migrations/0031_merge_20240315_1052.py +++ b/tbx/core/migrations/0031_merge_20240315_1052.py @@ -1,11 +1,11 @@ # Generated by Django 4.2.9 on 2024-03-15 10:52 from django.db import migrations + import tbx.core.utils.fields class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0030_remove_featured_case_study_tagline"), ("torchbox", "0030_use_custom_streamfield"), diff --git a/tbx/core/migrations/0032_alter_socialmediasettings_site_name.py b/tbx/core/migrations/0032_alter_socialmediasettings_site_name.py index 777add619..dae203d79 100644 --- a/tbx/core/migrations/0032_alter_socialmediasettings_site_name.py +++ b/tbx/core/migrations/0032_alter_socialmediasettings_site_name.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0031_merge_20240315_1052"), ] diff --git a/tbx/core/migrations/0033_add_navigation_title_override.py b/tbx/core/migrations/0033_add_navigation_title_override.py index 1ee30d75e..4de809199 100644 --- a/tbx/core/migrations/0033_add_navigation_title_override.py +++ b/tbx/core/migrations/0033_add_navigation_title_override.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0032_alter_socialmediasettings_site_name"), ] diff --git a/tbx/core/migrations/0034_add_earth_colour_theme.py b/tbx/core/migrations/0034_add_earth_colour_theme.py index 5d32b5566..c28326480 100644 --- a/tbx/core/migrations/0034_add_earth_colour_theme.py +++ b/tbx/core/migrations/0034_add_earth_colour_theme.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0033_add_navigation_title_override"), ] diff --git a/tbx/core/migrations/0035_add_important_page_settings.py b/tbx/core/migrations/0035_add_important_page_settings.py index f88b6290e..e93ac3630 100644 --- a/tbx/core/migrations/0035_add_important_page_settings.py +++ b/tbx/core/migrations/0035_add_important_page_settings.py @@ -5,7 +5,6 @@ class Migration(migrations.Migration): - dependencies = [ ("wagtailcore", "0091_remove_revision_submitted_for_moderation"), ("torchbox", "0034_add_earth_colour_theme"), diff --git a/tbx/core/migrations/0035_remove_address_settings.py b/tbx/core/migrations/0035_remove_address_settings.py index 8f48af674..4b8410f8c 100644 --- a/tbx/core/migrations/0035_remove_address_settings.py +++ b/tbx/core/migrations/0035_remove_address_settings.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0034_add_earth_colour_theme"), ] diff --git a/tbx/core/migrations/0036_delete_unused_tag_snippet.py b/tbx/core/migrations/0036_delete_unused_tag_snippet.py index d98f8b6b2..9e67a44d5 100644 --- a/tbx/core/migrations/0036_delete_unused_tag_snippet.py +++ b/tbx/core/migrations/0036_delete_unused_tag_snippet.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0035_remove_address_settings"), ] diff --git a/tbx/core/migrations/0037_merge_20240725_1000.py b/tbx/core/migrations/0037_merge_20240725_1000.py index 55f4e55bc..b02eedea9 100644 --- a/tbx/core/migrations/0037_merge_20240725_1000.py +++ b/tbx/core/migrations/0037_merge_20240725_1000.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("torchbox", "0035_add_important_page_settings"), ("torchbox", "0036_delete_unused_tag_snippet"), diff --git a/tbx/core/models.py b/tbx/core/models.py index c2303796c..8af14912e 100644 --- a/tbx/core/models.py +++ b/tbx/core/models.py @@ -2,13 +2,6 @@ from django.utils.functional import cached_property from modelcluster.fields import ParentalKey -from tbx.core.utils.fields import StreamField -from tbx.core.utils.models import ( - ColourThemeMixin, - NavigationFields, - SocialFields, -) -from tbx.people.models import ContactMixin from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel from wagtail.blocks import PageChooserBlock, StreamBlock, StructBlock from wagtail.contrib.settings.models import BaseSiteSetting, register_setting @@ -17,6 +10,14 @@ from wagtail.search import index from wagtail.snippets.models import register_snippet +from tbx.core.utils.fields import StreamField +from tbx.core.utils.models import ( + ColourThemeMixin, + NavigationFields, + SocialFields, +) +from tbx.people.models import ContactMixin + from .blocks import HomePageStoryBlock, StandardPageStoryBlock @@ -57,15 +58,6 @@ class LinkFields(models.Model): related_name="+", ) - @property - def link(self): - if self.link_page: - return self.link_page.url - elif self.link_document: - return self.link_document.url - else: - return self.link_external - panels = [ FieldPanel("link_external"), FieldPanel("link_page"), @@ -75,6 +67,15 @@ def link(self): class Meta: abstract = True + @property + def link(self): + if self.link_page_id: + return self.link_page.url + elif self.link_document: + return self.link_document.url + else: + return self.link_external + # Carousel items class CarouselItem(LinkFields): @@ -196,7 +197,7 @@ class StandardPage( # No longer in use but kept for migration history -class Tag(models.Model): +class Tag(models.Model): # noqa: DJ008 pass diff --git a/tbx/core/templatetags/reading_time_tags.py b/tbx/core/templatetags/reading_time_tags.py index ac7557693..417c5470c 100644 --- a/tbx/core/templatetags/reading_time_tags.py +++ b/tbx/core/templatetags/reading_time_tags.py @@ -3,8 +3,10 @@ from django import template from bs4 import BeautifulSoup + from tbx.core.blocks import ImageBlock + register = template.Library() # Using value of 275 words per minute. diff --git a/tbx/core/templatetags/torchbox_tags.py b/tbx/core/templatetags/torchbox_tags.py index 649325cc7..cf88756be 100644 --- a/tbx/core/templatetags/torchbox_tags.py +++ b/tbx/core/templatetags/torchbox_tags.py @@ -4,6 +4,7 @@ from tbx.blog.models import BlogPage from tbx.core.models import MainMenu + register = template.Library() @@ -95,16 +96,10 @@ def time_display(time): hour_string = str(hour) # Minute string - if minute != 0: - minute_string = "." + str(minute) - else: - minute_string = "" + minute_string = "." + str(minute) if minute != 0 else "" # PM string - if pm: - pm_string = "pm" - else: - pm_string = "am" + pm_string = "pm" if pm else "am" # Join and return return "".join([hour_string, minute_string, pm_string]) diff --git a/tbx/core/templatetags/util_tags.py b/tbx/core/templatetags/util_tags.py index 75dc15f30..3bdfdb194 100644 --- a/tbx/core/templatetags/util_tags.py +++ b/tbx/core/templatetags/util_tags.py @@ -1,9 +1,11 @@ from django import template from django.utils.text import camel_case_to_spaces, slugify -from tbx.core.utils.models import SocialMediaSettings from wagtail.blocks import StreamValue +from tbx.core.utils.models import SocialMediaSettings + + register = template.Library() diff --git a/tbx/core/tests/test_colour_theme.py b/tbx/core/tests/test_colour_theme.py index 240f4fa17..a83f7798b 100644 --- a/tbx/core/tests/test_colour_theme.py +++ b/tbx/core/tests/test_colour_theme.py @@ -1,6 +1,10 @@ from django.utils.text import slugify +from wagtail.models import Site +from wagtail.test.utils import WagtailPageTestCase + from bs4 import BeautifulSoup + from tbx.blog.factories import BlogIndexPageFactory, BlogPageFactory from tbx.core.factories import HomePageFactory, StandardPageFactory from tbx.core.utils.models import ColourTheme @@ -9,8 +13,6 @@ WorkIndexPageFactory, WorkPageFactory, ) -from wagtail.models import Site -from wagtail.test.utils import WagtailPageTestCase class TestColourTheme(WagtailPageTestCase): diff --git a/tbx/core/tests/test_models.py b/tbx/core/tests/test_models.py index d80226088..11cc55291 100644 --- a/tbx/core/tests/test_models.py +++ b/tbx/core/tests/test_models.py @@ -1,5 +1,3 @@ -from tbx.core.factories import HomePageFactory, StandardPageFactory -from tbx.core.models import HomePage, StandardPage from wagtail.models import Site from wagtail.test.utils import WagtailPageTestCase from wagtail.test.utils.form_data import ( @@ -8,6 +6,9 @@ streamfield, ) +from tbx.core.factories import HomePageFactory, StandardPageFactory +from tbx.core.models import HomePage, StandardPage + class TestHomePageFactory(WagtailPageTestCase): def test_create(self): diff --git a/tbx/core/tests/test_views.py b/tbx/core/tests/test_views.py index ab9c2ff9d..d10de9b3b 100644 --- a/tbx/core/tests/test_views.py +++ b/tbx/core/tests/test_views.py @@ -1,9 +1,10 @@ from django.test import TestCase, override_settings from django.urls import reverse -from tbx.core.factories import HomePageFactory from wagtail.models import Site +from tbx.core.factories import HomePageFactory + class SecurityViewTestCase(TestCase): url = reverse("security-txt") @@ -24,20 +25,20 @@ def test_accessible(self) -> None: class TestModeSwitcherView(TestCase): def test_view_sets_cookie(self): resp = self.client.get( - reverse("switch_mode"), data=dict(switch_mode=mode, next_url="/") + reverse("switch_mode"), data={"switch_mode": mode, "next_url": "/"} ) self.assertEqual(resp.cookies["torchbox-mode"].value, mode) def test_view_redirects_to_original_url(self): resp = self.client.get( - reverse("switch_mode"), data=dict(switch_mode=mode, next_url="/") + reverse("switch_mode"), data={"switch_mode": mode, "next_url": "/"} ) self.assertRedirects(resp, "/") def test_mode_is_set_on_subsequent_requests(self): self.client.get( reverse("switch_mode"), - data=dict(switch_mode=mode, next_url="/"), + data={"switch_mode": mode, "next_url": "/"}, headers={"accept": "text/html"}, ) @@ -47,7 +48,7 @@ def test_mode_is_set_on_subsequent_requests(self): def test_mode_cannot_be_outside_of_specific_values(self): resp = self.client.get( reverse("switch_mode"), - data=dict(switch_mode="some random value", next_url="/"), + data={"switch_mode": "some random value", "next_url": "/"}, headers={"accept": "text/html"}, ) @@ -61,14 +62,14 @@ def test_setting_random_mode_doesnt_work(self): # set valid mode self.client.get( reverse("switch_mode"), - data=dict(switch_mode=mode, next_url="/"), + data={"switch_mode": mode, "next_url": "/"}, headers={"accept": "text/html"}, ) # set invalid mode self.client.get( reverse("switch_mode"), - data=dict(switch_mode="some random value", next_url="/"), + data={"switch_mode": "some random value", "next_url": "/"}, headers={"accept": "text/html"}, ) @@ -96,7 +97,7 @@ def test_setting_theme_on_one_site_sets_it_on_multiple_sites(self): # set theme on default site self.client.get( reverse("switch_mode"), - data=dict(switch_mode=mode, next_url="/"), + data={"switch_mode": mode, "next_url": "/"}, ) # check theme is set on default site diff --git a/tbx/core/urls.py b/tbx/core/urls.py index d5a5e4b5e..f2a4d0ccd 100644 --- a/tbx/core/urls.py +++ b/tbx/core/urls.py @@ -3,6 +3,7 @@ from tbx.blog.feeds import BlogFeed from tbx.core import views + urlpatterns = [ path("blog/feed/", BlogFeed(), name="blog_feed"), path("newsletter-subscribe", views.newsletter_subsribe), diff --git a/tbx/core/utils/__init__.py b/tbx/core/utils/__init__.py index ea57dc815..dae93b0e5 100644 --- a/tbx/core/utils/__init__.py +++ b/tbx/core/utils/__init__.py @@ -1,5 +1,5 @@ -import hashlib from datetime import datetime, time, timedelta +import hashlib from itertools import cycle, islice @@ -27,14 +27,10 @@ def export_event(event, format="ical"): date = event.date_from + timedelta(days=day) # Get times - if event.time_from is not None: - start_time = event.time_from - else: - start_time = datetime.time.min - if event.time_to is not None: - end_time = event.time_to - else: - end_time = time.max + start_time = ( + event.time_from if event.time_from is not None else datetime.time.min + ) + end_time = event.time_to if event.time_to is not None else time.max # Combine dates and times start_datetime = datetime.combine(date, start_time) @@ -49,8 +45,13 @@ def add_slashes(string): string.replace("\n", "\\n") return string - # Make a uid - uid = hashlib.sha1(event.url + str(start_datetime)).hexdigest() + "@wagtaildemo" + # Make an uid + uid = ( + hashlib.sha1( + event.url + str(start_datetime), usedforsecurity=False + ).hexdigest() + + "@torchbox.com" + ) # Make event ical_components.extend( diff --git a/tbx/core/utils/migrations.py b/tbx/core/utils/migrations.py index 693a6249b..a2da95d30 100644 --- a/tbx/core/utils/migrations.py +++ b/tbx/core/utils/migrations.py @@ -1,5 +1,5 @@ -import json from functools import wraps +import json from django.core.exceptions import FieldError diff --git a/tbx/core/utils/models.py b/tbx/core/utils/models.py index 32f0e5b78..826465a58 100644 --- a/tbx/core/utils/models.py +++ b/tbx/core/utils/models.py @@ -7,6 +7,7 @@ from wagtail.contrib.settings.models import BaseSiteSetting, register_setting from wagtail.models import Orderable + SEARCH_DESCRIPTION_LABEL = "Meta description" # NOTE changing this requires migrations @@ -111,6 +112,11 @@ class ColourThemeMixin(models.Model): ), ) + promote_panels = [FieldPanel("theme")] + + class Meta: + abstract = True + @property def theme_class(self): if theme := self.theme: @@ -124,8 +130,3 @@ def theme_class(self): ) except StopIteration: return ColourTheme.NONE - - promote_panels = [FieldPanel("theme")] - - class Meta: - abstract = True diff --git a/tbx/core/utils/scripts/run_flightpath.py b/tbx/core/utils/scripts/run_flightpath.py index af06ae726..cbde44b9f 100644 --- a/tbx/core/utils/scripts/run_flightpath.py +++ b/tbx/core/utils/scripts/run_flightpath.py @@ -20,14 +20,14 @@ def get_flightpath_args_from_env(): "flightpath_url": os.environ["FLIGHTPATH_URL"], } - except KeyError: + except KeyError as err: raise KeyError( "You need the following environment variables to run flightpath: " "FLIGHTPATH_URL, HEROKU_APP_NAME_PRODUCTION, " "HEROKU_APP_NAME_STAGING, FLIGHTPATH_AUTH_KEY, " "DEPLOYMENT_KEY. This should be set on GitHub " "secrets if running as GitHub Actions." - ) + ) from err return args @@ -52,6 +52,7 @@ def post_to_flightpath( headers={ "Authorization": f"Token {flightpath_auth_key}", }, + timeout=30, ) response.raise_for_status() diff --git a/tbx/core/utils/scripts/run_flightpath_status_check.py b/tbx/core/utils/scripts/run_flightpath_status_check.py index fce391179..7718d2abf 100644 --- a/tbx/core/utils/scripts/run_flightpath_status_check.py +++ b/tbx/core/utils/scripts/run_flightpath_status_check.py @@ -18,12 +18,12 @@ def get_flightpath_args_from_env(): "flightpath_url": os.environ["FLIGHTPATH_URL"], } - except KeyError: + except KeyError as err: raise KeyError( "You need the following environment variables to run flightpath: " "FLIGHTPATH_URL, FLIGHTPATH_AUTH_KEY. " "This should be set on GitHub secrets if running as GitHub Actions." - ) + ) from err return args @@ -38,6 +38,7 @@ def get_flightpath_job_status(flightpath_url, flightpath_auth_key, job_id): headers={ "Authorization": f"Token {flightpath_auth_key}", }, + timeout=30, ) response.raise_for_status() return response diff --git a/tbx/core/views.py b/tbx/core/views.py index 47fdec635..a3e80e54f 100644 --- a/tbx/core/views.py +++ b/tbx/core/views.py @@ -1,5 +1,5 @@ -import logging from datetime import timedelta +import logging from django.conf import settings from django.http import HttpResponse, HttpResponseNotFound @@ -11,9 +11,11 @@ from django.views.generic import TemplateView import requests + from tbx.core.errors import UnauthorizedHTTPError from tbx.core.forms import ModeSwitcherForm + logger = logging.getLogger(__name__) @@ -28,6 +30,7 @@ def newsletter_subsribe(request): "id": settings.MAILCHIMP_MAILING_LIST_ID, "email": {"email": request.GET.get("email")}, }, + timeout=20, ) return HttpResponse() diff --git a/tbx/core/wagtail_hooks.py b/tbx/core/wagtail_hooks.py index d439c160e..dbed8f654 100644 --- a/tbx/core/wagtail_hooks.py +++ b/tbx/core/wagtail_hooks.py @@ -6,13 +6,14 @@ from django.utils.html import format_html from django.utils.safestring import mark_safe -from PIL import ImageEnhance -from storages.backends.s3 import S3Storage from wagtail import hooks from wagtail.documents import get_document_model from wagtail.documents.models import document_served from wagtail.images.image_operations import FilterOperation +from PIL import ImageEnhance +from storages.backends.s3 import S3Storage + @hooks.register("before_serve_document", order=100) def serve_document_from_s3(document, request): @@ -51,7 +52,7 @@ def hotjar_admin_tracking(): if not hjid: return "" - return mark_safe( + return mark_safe( # noqa: S308 f"""