Merge branch 'main' into black

.github/workflows/CD.yml

@@ -0,0 +1,19 @@
+name: 🪂 Deploy
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+  release:
+    types: [published, edited, prereleased]
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: 🔨 Build and deploy docker image
+    uses: WGBH-MLA/.github/.github/workflows/build.yml@main
+    with:
+      target: production

.github/workflows/CI.yml

@@ -0,0 +1,21 @@
+name: 🧪 Integration Tests
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  tests:
+    name: ⚗️ Application Tests
+    uses: WGBH-MLA/.github/.github/workflows/pytest-with-postgres.yml@main
+    secrets: inherit
+    with:
+      pdm_args: -G test,ci
+      pytest_args: -n auto --nbmake -ra -s
+      pg_db: ov-test
+
+  lint:
+    name: 👕 Lint
+    uses: WGBH-MLA/.github/.github/workflows/lint.yml@main
+
+  black:
+    name: 🖤 Black
+    uses: WGBH-MLA/.github/.github/workflows/black.yml@main

.github/workflows/publish.yml

@@ -0,0 +1,46 @@
+name: 🏛 Publish to PyPi
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    name: 📦 Build package
+    runs-on: ubuntu-latest
+    steps:
+      - name: 📰 Checkout
+        uses: actions/checkout@v3
+
+      - name: 📲 Setup PDM
+        uses: pdm-project/setup-pdm@v3
+        id: setup-python
+        with:
+          python-version: 3.x
+
+      - name: 🚚 Install dependencies
+        run: pdm install --prod
+
+      - name: 🏗️ Build package
+        run: pdm build
+
+      - name: 🛫 Export build files
+        uses: actions/upload-artifact@v3
+        with:
+          name: dist
+          path: dist
+
+  publish:
+    name: 🗞 Publish package
+    needs: build
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
+    steps:
+      - name: 🛬 Download artifacts
+        uses: actions/download-artifact@v3
+
+      - name: 🗞 Publish package
+        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/release.yml

@@ -0,0 +1,11 @@
+name: 📦 Release
+
+on:
+  milestone:
+    types: [closed]
+  workflow_dispatch:
+
+jobs:
+  release:
+    name: 📝 Draft Release
+    uses: WGBH-MLA/.github/.github/workflows/draft_release.yml@main

.github/workflows/update.yml

@@ -0,0 +1,12 @@
+name: 🛍 Update dependencies
+# On Wednesdays, we update our dependencies.
+
+on:
+  schedule:
+    - cron: 0 12 * * 3
+  workflow_dispatch:
+
+jobs:
+  update:
+    name: 🦿 Update dependencies
+    uses: WGBH-MLA/.github/.github/workflows/update.yml@main

dev.yml

@@ -8,7 +8,6 @@ services:
       - db
     environment:
       OV_DB_HOST: db
-    #   OV_DB_PASSWORD:
     env_file:
       - .env
   db:

docker-compose.yml

@@ -5,7 +5,8 @@ services:
     build:
       context: .
       target: base
-    image: ov-wag
+    # Use the `image` property to run a prebuilt image from GHCR instead of building locally. Requires disabling the `build` section above.
+    # image: ghcr.io/wgbh-mla/ov-wag:main
     volumes:
       - ./:/app/
     entrypoint: /app/docker_entrypoints/dev.sh
@@ -15,20 +16,11 @@ services:
         delay: 5s
         max_attempts: 3
         window: 5s
-  wagtail-tests:
-    build:
-      context: .
-      target: test
-    image: ov-tests
-    volumes:
-      - ./:/app/
-    entrypoint: /app/docker_entrypoints/test.sh
-    environment:
-      - OV_DB_ENGINE=django.db.backends.sqlite3
-      - OV_DB_NAME=testdb
   db:
-    image: postgres:14.2-alpine
-    volumes:
-      - ./db:/var/lib/postgresql/data:Z
-    user: ${UID}:${GID}
+    image: postgres:16-alpine
     restart: always
+    volumes:
+      - db:/var/lib/postgresql/data
+
+volumes:
+  db:

ov

@@ -7,14 +7,14 @@ USAGE:\n\n
 
 COMMANDS:\n\n
 
-\t  b | build \t  build the docker image\n
-\t  c | cmd \t    run a bash command with the wagtail docker image\n
-\t  coverage \t   run the coverage tests
-\t  d | dev \t    start a development server\n
-\t  h | help \t   prints this help text\n
-\t  s | shell \t  enter into a python shell with the app context\n
-\t  t | test \t   run the wagtail test suite
-\t  m | manage \t run a manage.py command
+\t  b | build \t     build the docker image\n
+\t  c | cmd \t       run a bash command with the wagtail docker image\n
+\t  cov | coverage\t run the coverage tests\n
+\t  d | dev \t       start a development server\n
+\t  h | help \t      prints this help text\n
+\t  s | shell \t     enter into a python shell with the app context\n
+\t  t | test \t      run the wagtail test suite\n
+\t  m | manage \t    run a manage.py command\n\n
 "
 
 COMPOSE="docker compose -f docker-compose.yml"

test.yml

@@ -0,0 +1,14 @@
+version: '3.8'
+
+services:
+  tests:
+    build:
+      context: .
+      target: test
+    image: ov-tests
+    volumes:
+      - ./:/app/
+    entrypoint: /app/docker_entrypoints/test.sh
+    environment:
+      - OV_DB_ENGINE=django.db.backends.sqlite3
+      - OV_DB_NAME=testdb