Skip to content

Commit

Permalink
Upgrade to Djanog 4.2.X + adjustment for postgres 12+
Browse files Browse the repository at this point in the history
  • Loading branch information
@vanbuiten
vanbuiten committed Jul 1, 2024
1 parent 4fc9de4 commit 48f20ae
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 27 deletions.
1 change: 0 additions & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ RUN set -eux; \
apt-get install -y \
build-essential \
gdal-bin \
postgresql-client-11 \
build-essential \
libpq-dev \
gettext \
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ services:
command: /run.sh

postgis:
image: postgis/postgis:11-3.3
image: postgis/postgis:12-3.2-alpine
ports:
- "54321:5432"
environment:
Expand Down
4 changes: 2 additions & 2 deletions requirements.in
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Celery
coreapi
Django>=4.1,<4.2
Django>=4.1,<4.3
django-celery-beat
django-celery-results
django-cors-headers
Expand All @@ -19,7 +19,7 @@ opencensus-ext-django
opencensus-ext-logging
opencensus-ext-postgresql
opencensus-ext-requests
psycopg2
psycopg2-binary
python-keycloak
urllib3<2.0.0
uvicorn
Expand Down
16 changes: 8 additions & 8 deletions requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ asgiref==3.8.1
# via
# django
# django-cors-headers
# django-simple-history
async-property==0.2.2
# via python-keycloak
azure-core==1.30.2
Expand Down Expand Up @@ -67,14 +66,15 @@ cryptography==42.0.8
# pyjwt
deprecation==2.1.0
# via python-keycloak
django==4.1.13
django==4.2.13
# via
# -r requirements.in
# django-celery-beat
# django-celery-results
# django-cors-headers
# django-extensions
# django-filter
# django-simple-history
# django-timezone-field
# djangorestframework
# drf-yasg
Expand All @@ -87,13 +87,13 @@ django-cors-headers==4.4.0
# via -r requirements.in
django-extensions==3.2.3
# via -r requirements.in
django-filter==23.5
django-filter==24.2
# via -r requirements.in
django-simple-history==3.6.0
django-simple-history==3.7.0
# via -r requirements.in
django-timezone-field==6.1.0
# via django-celery-beat
djangorestframework==3.15.1
djangorestframework==3.15.2
# via
# -r requirements.in
# drf-yasg
Expand Down Expand Up @@ -184,10 +184,10 @@ protobuf==5.27.2
# proto-plus
psutil==6.0.0
# via opencensus-ext-azure
psycopg2==2.9.9
# via -r requirements.in
psycopg2-binary==2.9.9
# via opencensus-ext-postgresql
# via
# -r requirements.in
# opencensus-ext-postgresql
pyasn1==0.6.0
# via
# pyasn1-modules
Expand Down
14 changes: 6 additions & 8 deletions requirements_dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ asgiref==3.8.1
# -r ./requirements_test.txt
# django
# django-cors-headers
# django-simple-history
async-property==0.2.2
# via
# -r ./requirements_test.txt
Expand Down Expand Up @@ -120,7 +119,7 @@ distlib==0.3.8
# via
# -r ./requirements_test.txt
# virtualenv
django==4.1.13
django==4.2.13
# via
# -r ./requirements_test.txt
# django-celery-beat
Expand All @@ -129,6 +128,7 @@ django==4.1.13
# django-debug-toolbar
# django-extensions
# django-filter
# django-simple-history
# django-timezone-field
# djangorestframework
# drf-yasg
Expand All @@ -139,19 +139,19 @@ django-celery-results==2.5.1
# via -r ./requirements_test.txt
django-cors-headers==4.4.0
# via -r ./requirements_test.txt
django-debug-toolbar==4.3.0
django-debug-toolbar==4.4.2
# via -r requirements_dev.in
django-extensions==3.2.3
# via -r ./requirements_test.txt
django-filter==23.5
django-filter==24.2
# via -r ./requirements_test.txt
django-simple-history==3.6.0
django-simple-history==3.7.0
# via -r ./requirements_test.txt
django-timezone-field==6.1.0
# via
# -r ./requirements_test.txt
# django-celery-beat
djangorestframework==3.15.1
djangorestframework==3.15.2
# via
# -r ./requirements_test.txt
# drf-yasg
Expand Down Expand Up @@ -329,8 +329,6 @@ psutil==6.0.0
# via
# -r ./requirements_test.txt
# opencensus-ext-azure
psycopg2==2.9.9
# via -r ./requirements_test.txt
psycopg2-binary==2.9.9
# via
# -r ./requirements_test.txt
Expand Down
12 changes: 5 additions & 7 deletions requirements_test.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ asgiref==3.8.1
# -r ./requirements.txt
# django
# django-cors-headers
# django-simple-history
async-property==0.2.2
# via
# -r ./requirements.txt
Expand Down Expand Up @@ -109,14 +108,15 @@ deprecation==2.1.0
# python-keycloak
distlib==0.3.8
# via virtualenv
django==4.1.13
django==4.2.13
# via
# -r ./requirements.txt
# django-celery-beat
# django-celery-results
# django-cors-headers
# django-extensions
# django-filter
# django-simple-history
# django-timezone-field
# djangorestframework
# drf-yasg
Expand All @@ -129,15 +129,15 @@ django-cors-headers==4.4.0
# via -r ./requirements.txt
django-extensions==3.2.3
# via -r ./requirements.txt
django-filter==23.5
django-filter==24.2
# via -r ./requirements.txt
django-simple-history==3.6.0
django-simple-history==3.7.0
# via -r ./requirements.txt
django-timezone-field==6.1.0
# via
# -r ./requirements.txt
# django-celery-beat
djangorestframework==3.15.1
djangorestframework==3.15.2
# via
# -r ./requirements.txt
# drf-yasg
Expand Down Expand Up @@ -301,8 +301,6 @@ psutil==6.0.0
# via
# -r ./requirements.txt
# opencensus-ext-azure
psycopg2==2.9.9
# via -r ./requirements.txt
psycopg2-binary==2.9.9
# via
# -r ./requirements.txt
Expand Down

0 comments on commit 48f20ae

Please sign in to comment.