Skip to content
This repository has been archived by the owner on Apr 24, 2024. It is now read-only.

Commit

Permalink
Revert "Merge branch 'support/wagtail-52' into staging"
Browse files Browse the repository at this point in the history
This reverts commit 0d77e6c, reversing
changes made to e958693.
  • Loading branch information
katdom13 committed Dec 19, 2023
1 parent 0d77e6c commit c679ad2
Show file tree
Hide file tree
Showing 9 changed files with 103 additions and 88 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.11
python-version: 3.9
cache: 'pip'

- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

services:
postgres:
image: postgres:13.12
image: postgres:9.6
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres # pragma: allowlist secret
Expand All @@ -30,7 +30,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.11
python-version: 3.9
- uses: Gr1n/setup-poetry@v8
with:
poetry-version: 1.5.1
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
default_language_version:
node: system
python: python3.11
python: python3.9
repos:
- repo: https://github.com/python/black
rev: 22.3.0
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN npm run build:prod
# ones becase they use a different C compiler. Debian images also come with
# all useful packages required for image manipulation out of the box. They
# however weight a lot, approx. up to 1.5GiB per built image.
FROM python:3.11 as production
FROM python:3.9-buster as production

ARG POETRY_INSTALL_ARGS="--no-dev"

Expand Down Expand Up @@ -101,7 +101,7 @@ USER root

# Install `psql`, useful for `manage.py dbshell`
RUN apt-get update --yes --quiet && apt-get install --yes --quiet --no-install-recommends \
postgresql-client jpegoptim pngquant gifsicle libjpeg-progs webp \
postgresql-client \
&& apt-get autoremove && rm -rf /var/lib/apt/lists/*

# Restore user
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ services:
- redis

db:
image: postgres:13.12
image: postgres:12.3
expose:
- 5432
environment:
Expand Down
138 changes: 89 additions & 49 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ description = "Torchbox.com"
authors = ["Torchbox Ltd"]

[tool.poetry.dependencies]
python = "^3.11"
Django = "~4.2"
wagtail = "~5.2"
python = "^3.9"
Django = "~3.2.20"
wagtail = "~5.1"
psycopg2 = "^2.9.3"
gunicorn = {version = "^20.1.0", optional = true}
django-pattern-library = "^1.1.0"
django-pattern-library = "^1.0.0"
whitenoise = "^6.1.0"
dj-database-url = "^0.5.0"
django-redis = "^5.2.0"
Expand All @@ -24,12 +24,12 @@ wagtail-accessibility = "^0.2.1"
django-phonenumber-field = "^7.0.2"
phonenumbers = "^8.12.48"
wagtail-purge = "^0.3.0"
wagtail-webstories = "^0.1.1"
wagtail-webstories = "^0.1"
wagtail-markdown = "^0.11.1"
django-birdbath = "^1.1.0"
sentry-sdk = "^1.12.1"
Wand = "^0.6.10"
wagtailmedia = "^0.14.5"
wagtailmedia = "^0.14.2"

[tool.poetry.extras]
gunicorn = ["gunicorn"]
Expand Down
Loading

0 comments on commit c679ad2

Please sign in to comment.