Upgrade wagtail 6 (#9)

* Upgrade wagtail to version 6.

* Remove uneeded use_json_field from StreamField declaration.

* Update import for Query model.

* Bump uv version. Don't install dev dependencies.

* Add action to deploy PRs to preview app.

* Fix name of fly organization.

* Ignore local .env* files.

* Ensure static directory is present for deploy.

* Ensure /app/static and /app/media are present with .keep file.

* Ensure DJANGO_SETTINGS_MODULE correct for both dev and production.

* Don't ignore static subdirs in docker image, do ignore .env files.

* Get SECRET_KEY config setting from environment variable.

* Fix collectstatic to not require confirmation.

Author: alflanagan

.dockerignore

@@ -5,6 +5,7 @@ terraform/
 .idea/
 .vscode/
 **/.venv/
-**/static/
+alloydflanagan/static/*
+!alloydflanagan/static/.keep
 **/.DS_Store
 **/.env*

.github/workflows/fly-preview.yml

@@ -0,0 +1,35 @@
+name: Deploy Review App
+on:
+  # Run this workflow on every PR event. Existing review apps will be updated when the PR is updated.
+  pull_request:
+    types: [opened, reopened, synchronize, closed]
+
+env:
+  FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+  # Set these to your Fly.io organization and preferred region.
+  FLY_REGION: iad
+  FLY_ORG: personal
+
+jobs:
+  review_app:
+    runs-on: ubuntu-latest
+    outputs:
+      url: ${{ steps.deploy.outputs.url }}
+    # Only run one deployment at a time per PR.
+    concurrency:
+      group: pr-${{ github.event.number }}
+
+    # Deploying apps with this "review" environment allows the URL for the app to be displayed in the PR UI.
+    # Feel free to change the name of this environment.
+    environment:
+      name: review
+      # The script in the `deploy` sets the URL output for each review app.
+      url: ${{ steps.deploy.outputs.url }}
+    steps:
+      - name: Get code
+        uses: actions/checkout@v4
+
+      - name: Deploy PR app to Fly.io
+        id: deploy
+        uses: superfly/[email protected]
+

.gitignore

@@ -1,7 +1,8 @@
+# NOTE: see also app/.gitignore
 __pycache__/
 .idea/
 .DS_Store
-secrets.txt
+**/.env*
 
 # directories w/files from old website
 /public/

Dockerfile

@@ -24,7 +24,8 @@ EXPOSE 8080
 # 2. Set PORT variable that is used by Gunicorn. This should match "EXPOSE"
 #    command.
 ENV PYTHONUNBUFFERED=1 \
-  PORT=8080
+    PORT=8080 \
+    DJANGO_SETTINGS_MODULE=alloydflanagan.settings.production
 
 # Use /app folder as a directory where the source code is stored.
 WORKDIR /app
@@ -33,8 +34,8 @@ WORKDIR /app
 COPY app /app/
 
 #TODO: get uv to use system python instead of downloading -- faster, more reliable.
-RUN pip install --no-cache-dir uv==0.7.13 && \
-    uv sync --frozen
+RUN pip install --no-cache-dir uv==0.7.17 && \
+    uv sync --frozen --no-dev
 
 # Note: Fly automatically sets DATABASE_URL
 CMD ["make", "run-server"]

app/.gitignore

@@ -1,5 +1,9 @@
 # files collected by manage.py collectstatic
-static/
+/static/*
+!/static/.keep
+
+media/*
+!media/.keep
 
 # yarn pnp files
 .pnp.*

app/Makefile

@@ -2,7 +2,7 @@ PYTHON=uv run --link-mode=copy python
 
 run-server:
 	$(PYTHON) manage.py migrate
-	$(PYTHON) manage.py collectstatic
+	$(PYTHON) manage.py collectstatic --no-input
 	uv run gunicorn --timeout 30 alloydflanagan.wsgi:application --log-file -
 
 djhtml:

app/alloydflanagan/home/models.py

@@ -17,7 +17,7 @@ class HomePage(Page):
         ('text', RichTextBlock()),  #probably will use custom type later
         ('image', ImageChooserBlock()),
         ('header', HeaderBlock()),
-    ], use_json_field=True, blank=True)
+    ], blank=True)
 
     content_panels = Page.content_panels + [
         FieldPanel("intro", classname="full"),

app/alloydflanagan/search/views.py

@@ -2,7 +2,7 @@
 from django.template.response import TemplateResponse
 
 from wagtail.models import Page
-from wagtail.search.models import Query
+from wagtail.contrib.search_promotions.models import Query
 
 
 def search(request):

app/alloydflanagan/settings/base.py

@@ -29,6 +29,7 @@
     "django.contrib.contenttypes",
     "django.contrib.sessions",
     "django.contrib.messages",
+    "wagtail.contrib.search_promotions",
     "django.contrib.staticfiles",
     "wagtail.contrib.forms",
     "wagtail.contrib.redirects",

app/alloydflanagan/settings/production.py

@@ -6,3 +6,5 @@
     from .local import *
 except ImportError:
     pass
+
+SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY')