New Release v0.7.0 - #minor

Dockerfile

@@ -2,7 +2,7 @@
 # Container that contains basic configurations used by all other containers
 # It should only contain variables that don't change or change very infrequently
 # so that the cache is not needlessly invalidated
-FROM python:3.12-slim-bullseye AS base
+FROM python:3.12-slim-bookworm AS base
 ENV HTTP_PORT=8080
 ENV USER=geoadmin
 ENV GROUP=geoadmin

Makefile

@@ -52,6 +52,9 @@ DOCKER_IMG_LOCAL_TAG := $(DOCKER_REGISTRY)/$(SERVICE_NAME):local-$(USER)-$(GIT_H
 # AWS variables
 AWS_DEFAULT_REGION = eu-central-1
 
+# Env file for dockerrun, defaults to .env.local / .env
+ENV_FILE ?= $(if $(wildcard .env.local),.env.local,.env)
+
 .PHONY: ci
 ci:
 	# Create virtual env with all packages for development using the Pipfile.lock
@@ -118,15 +121,14 @@ dockerpush: dockerbuild ## Push to the docker registry
 
 
 .PHONY: dockerrun
-dockerrun: clean_logs dockerbuild $(LOGS_DIR) ## Run the locally built docker image
+dockerrun: dockerbuild ## Run the locally built docker image
 	docker run \
 		-it -p $(HTTP_PORT):8080 \
-		--env-file=${PWD}/${ENV_FILE} \
-		--env LOGS_DIR=/logs \
-		--env SCRIPT_NAME=$(ROUTE_PREFIX) \
-		--mount type=bind,source="${LOGS_DIR}",target=/logs \
-		$(DOCKER_IMG_LOCAL_TAG)
-
+		--env-file=${ENV_FILE} \
+		--env DJANGO_SETTINGS_MODULE=config.settings_prod \
+		--env ALLOWED_HOSTS=127.0.0.1 \
+		--net=host \
+		$(DOCKER_IMG_LOCAL_TAG) ./wsgi.py
 
 # make sure that the code conforms to the style guide. Note that
 # - the DJANGO_SETTINGS module must be made available to pylint

Pipfile

@@ -4,45 +4,45 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-django = "~=5.0.14"
-django-ninja = "~=1.1"
-psycopg2-binary = "~=2.9.5"
-django-environ = "~=0.11"
+django = "~=5.2"
+django-ninja = "~=1.4"
+psycopg2-binary = "~=2.9"
+django-environ = "~=0.12"
 gunicorn = "~=23.0"
-pyyaml = "~=6.0.2"
-gevent = "~=24.2"
-logging-utilities = "~=4.4.1"
-boto3 = "~=1.35.78"
-nanoid = "~=2.0.0"
-whitenoise = "~=6.8.2"
-pystac-client = "~=0.8.5"
-ecs-logging = "*"
-beautifulsoup4 = "*"
-requests = "*"
+pyyaml = "~=6.0"
+gevent = "~=25.4"
+logging-utilities = "~=4.6"
+boto3 = "~=1.37"
+nanoid = "~=2.0"
+whitenoise = "~=6.9"
+pystac-client = "~=0.8"
+ecs-logging = "~=2.2"
+beautifulsoup4 = "~=4.13"
+requests = "~=2.32"
 
 [dev-packages]
 yapf = "*"
 pylint = "*"
 pylint-django = "*"
 ipdb = "*"
 isort = "*"
-django-extensions = "~=3.2"
-django_debug_toolbar= "~=4.2"
+django-extensions = "*"
+django_debug_toolbar= "*"
 faker = "*"
 factory-boy = "*"
 dill = "*"
 pytest = "*"
 pytest-django = "*"
 mypy = "*"
-types-gevent = "*"
-django-stubs = "~=5.0.4"
 debugpy = "*"
-boto3-stubs = {extras = ["cognito-idp"], version = "~=1.35"}
 bandit = "*"
+django-stubs = "~=5.1"
+boto3-stubs = {extras = ["cognito-idp"], version = "~=1.37"}
 pytest-xdist = "*"
-types-nanoid = "*"
 pytest-cov = "*"
-types-requests = "*"
+types-nanoid = "~=2.0"
+types-gevent = "~=24.11"
+types-requests = "~=2.32"
 
 [requires]
 python_version = "3.12"

app/access/models.py

@@ -1,4 +1,5 @@
 from logging import getLogger
+from typing import Any
 from typing import Iterable
 
 from cognito.utils.client import Client
@@ -63,6 +64,7 @@ def is_active(self) -> bool:
 
     def save(
         self,
+        *args: Any,
         force_insert: bool | tuple[ModelBase, ...] = False,
         force_update: bool = False,
         using: str | None = None,

app/distributions/models.py

@@ -1,3 +1,4 @@
+from typing import Any
 from typing import Iterable
 
 from utils.fields import CustomSlugField
@@ -42,6 +43,7 @@ def __str__(self) -> str:
 
     def save(
         self,
+        *args: Any,
         force_insert: bool | tuple[ModelBase, ...] = False,
         force_update: bool = False,
         using: str | None = None,
@@ -94,6 +96,7 @@ def __str__(self) -> str:
 
     def save(
         self,
+        *args: Any,
         force_insert: bool | tuple[ModelBase, ...] = False,
         force_update: bool = False,
         using: str | None = None,
@@ -132,6 +135,7 @@ def __str__(self) -> str:
 
     def save(
         self,
+        *args: Any,
         force_insert: bool | tuple[ModelBase, ...] = False,
         force_update: bool = False,
         using: str | None = None,

app/provider/models.py

@@ -1,3 +1,4 @@
+from typing import Any
 from typing import Iterable
 
 from utils.fields import CustomSlugField
@@ -44,6 +45,7 @@ def __str__(self) -> str:
 
     def save(
         self,
+        *args: Any,
         force_insert: bool | tuple[ModelBase, ...] = False,
         force_update: bool = False,
         using: str | None = None,

docker-compose.yml

@@ -32,7 +32,7 @@ services:
         node /app/start.js;
       "
   bod:
-    image: postgis/postgis:13-3.4
+    image: postgis/postgis:16-3.5
     environment:
       - POSTGRES_USER=${BOD_USER}
       - POSTGRES_PASSWORD=${BOD_PW}