From b09ac1a4496be241e576fbce0f857c4e9f994e6a Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Tue, 24 Aug 2021 23:33:10 -0700 Subject: [PATCH] Bump Django to 3.1.x since 3.0 is now EOL'd. (#477) --- postorius/Dockerfile | 2 +- postorius/Dockerfile.dev | 2 +- web/Dockerfile | 2 +- web/Dockerfile.dev | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index 04ab644..413bacc 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -16,7 +16,7 @@ RUN set -ex \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip libffi libuuid pcre-dev \ - && python3 -m pip install -U 'Django<3.0' pip setuptools wheel \ + && python3 -m pip install -U 'Django<3.2' pip setuptools wheel \ && python3 -m pip install postorius==1.3.4 \ uwsgi \ psycopg2 \ diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 61e4734..bbaed83 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -30,7 +30,7 @@ RUN set -ex \ mysqlclient \ typing \ django-utils-six \ - && python3 -m pip install -U 'Django<3.1' \ + && python3 -m pip install -U 'Django<3.2' \ && python3 -m pip install -U \ git+https://gitlab.com/mailman/django-mailman3@${DJ_MM3_REF} \ && apk del .build-deps \ diff --git a/web/Dockerfile b/web/Dockerfile index 3d91f33..8077164 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -16,7 +16,7 @@ RUN set -ex \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip xapian-core xapian-bindings-python3 libffi pcre-dev \ - && python3 -m pip install -U 'Django<3.1' pip setuptools wheel \ + && python3 -m pip install -U 'Django<3.2' pip setuptools wheel \ && pip install mailmanclient==3.3.2 \ postorius==1.3.4 \ hyperkitty==1.3.4 \ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 0a8d261..1771c7f 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -36,7 +36,7 @@ RUN set -ex \ python-memcached \ diskcache \ django-utils-six \ - && python3 -m pip install -U 'Django<3.1' \ + && python3 -m pip install -U 'Django<3.2' \ && python3 -m pip install -U \ git+https://gitlab.com/mailman/django-mailman3@${DJ_MM3_REF} \ && apk del .build-deps \