Skip to content

Commit

Permalink
Merge pull request #473 from wagtail/chore/wagtail-61
Browse files Browse the repository at this point in the history
Upgraded to Wagtail 6.1 and Django 5.0
  • Loading branch information
vossisboss authored Oct 16, 2024
2 parents 468ccd4 + c7041c1 commit 9acdc9d
Show file tree
Hide file tree
Showing 16 changed files with 367 additions and 498 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ jobs:
DATABASE_URL: postgres://postgres:postgres@localhost/postgres
SECRET_KEY: iamnotsosecret
ALLOWED_HOSTS: localhost
COMPUTER_VISION_API_KEY: fake
COMPUTER_VISION_REGION: fake
services:
postgres:
image: postgres:13
Expand All @@ -74,7 +72,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install Poetry
run: pipx install poetry==1.4.0 # Make sure this matches POETRY_VERSION in the Dockerfile
run: pipx install poetry==1.8.3 # Make sure this matches POETRY_VERSION in the Dockerfile
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN npm run build:prod
# Build Python app - this stage is a common base for the prod and dev stages
FROM python:3.11-bullseye AS backend

ARG POETRY_VERSION=1.4.0
ARG POETRY_VERSION=1.8.3
ARG UID=1000
ARG GID=1000

Expand Down
Loading

0 comments on commit 9acdc9d

Please sign in to comment.