Skip to content

Commit

Permalink
Update to Wagtail 5.2 (#443)
Browse files Browse the repository at this point in the history
  • Loading branch information
zerolab authored Jan 15, 2024
2 parents 80afd68 + 7e18664 commit 2e0d4c0
Show file tree
Hide file tree
Showing 19 changed files with 4,101 additions and 834 deletions.
12 changes: 4 additions & 8 deletions fabfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

# Process .env file
if os.path.exists(".env"):
with open(".env", "r") as f:
with open(".env") as f:
for line in f.readlines():
if not line or line.startswith("#") or "=" not in line:
continue
Expand All @@ -34,9 +34,7 @@


def dexec(cmd, service="web"):
return local(
"docker-compose exec -T {} bash -c {}".format(quote(service), quote(cmd))
)
return local(f"docker-compose exec -T {quote(service)} bash -c {quote(cmd)}")


@task
Expand Down Expand Up @@ -190,9 +188,7 @@ def staging_shell(c):


def delete_local_database(c, local_database_name=LOCAL_DATABASE_NAME):
local(
"dropdb --if-exists {database_name}".format(database_name=LOCAL_DATABASE_NAME)
)
local(f"dropdb --if-exists {LOCAL_DATABASE_NAME}")


####
Expand Down Expand Up @@ -313,6 +309,6 @@ def open_heroku_shell(c, app_instance, shell_command="bash"):

def get_heroku_variable(c, app_instance, variable):
return local(
"heroku config:get {var} --app {app}".format(app=app_instance, var=variable),
f"heroku config:get {variable} --app {app_instance}",
hide=True,
).stdout.strip()
1,424 changes: 686 additions & 738 deletions poetry.lock

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "wagtail-org"
version = "2.1.0"
version = "2.2.0"
description = "The wagtail.org Wagtail site"
authors = ["Torchbox <[email protected]>"]
license = "BSD-3-Clause"
Expand All @@ -13,28 +13,28 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry.dependencies]
python = "^3.11"
django = "~3.2"
wagtail = "~4.2.0"
django = "~4.2.8"
wagtail = "~5.2.2"
psycopg2 = "~2.9"
gunicorn = "~20.1.0"
dj-database-url = "~1.2.0"
gunicorn = "~21.2.0"
dj-database-url = "~2.1.0"
django-basic-auth-ip-whitelist = "~0.5"
django-csp = "~3.7"
django-manifest-loader = "~1.0.0"
django-pattern-library = "~1.0.0"
django-permissions-policy = "~4.15"
django-pattern-library = "~1.1.0"
django-permissions-policy = "~4.18"
django-referrer-policy = "~1.0"
django-storages = { version ="~1.13", extras = ["boto3"] }
markdown = "~3.4"
pygments = "~2.14"
markdown = "~3.5"
pygments = "~2.17"
requests = "~2.28.1"
scout-apm = "~2.26"
sentry-sdk = "~1.16"
wagtail-font-awesome-svg = "~0.0.3"
scout-apm = "~3.0"
sentry-sdk = "~1.38"
wagtail-font-awesome-svg = "~1.0.1"
wagtailaltgenerator = "~4.1.2" # Compatible with Wagtail <= 5.0 as far as I can tell, but not explicitly supported/tested by the package.
wagtailmedia = "~0.13"
whitenoise = "~6.3"
django-redis = "~5.2"
wagtailmedia = "~0.14.5"
whitenoise = "~6.6"
django-redis = "~5.4"

[tool.poetry.group.dev.dependencies]
black = "23.1.0"
Expand Down
Loading

0 comments on commit 2e0d4c0

Please sign in to comment.