Merge branch 'develop'

Dockerfile

@@ -1,5 +1,5 @@
 # Using Ubuntu base for access to GDAL PPA
-FROM ubuntu:22.04
+FROM public.ecr.aws/ubuntu/ubuntu:22.04
 WORKDIR /smbackend
 
 # tzdata installation requires settings frontend

requirements-dev.txt

@@ -1,71 +1,69 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile requirements-dev.in
 #
 asttokens==2.4.1
     # via stack-data
-certifi==2024.2.2
+certifi==2024.6.2
     # via requests
 cffi==1.16.0
     # via
     #   cryptography
     #   pynacl
 charset-normalizer==3.3.2
     # via requests
-cryptography==42.0.3
+cryptography==42.0.8
     # via pyjwt
 decorator==5.1.1
     # via ipython
 deprecated==1.2.14
     # via pygithub
-exceptiongroup==1.2.0
-    # via ipython
 executing==2.0.1
     # via stack-data
-idna==3.6
+idna==3.7
     # via requests
-ipython==8.21.0
+ipython==8.25.0
     # via -r requirements-dev.in
 jedi==0.19.1
     # via ipython
-matplotlib-inline==0.1.6
+matplotlib-inline==0.1.7
     # via ipython
-parso==0.8.3
+parso==0.8.4
     # via jedi
 pexpect==4.9.0
     # via ipython
-prompt-toolkit==3.0.43
+prompt-toolkit==3.0.46
     # via ipython
 ptyprocess==0.7.0
     # via pexpect
 pure-eval==0.2.2
     # via stack-data
-pycparser==2.21
+pycparser==2.22
     # via cffi
-pygithub==2.2.0
+pygithub==2.3.0
     # via -r requirements-dev.in
-pygments==2.17.2
+pygments==2.18.0
     # via ipython
 pyjwt[crypto]==2.8.0
-    # via
-    #   pygithub
-    #   pyjwt
+    # via pygithub
 pynacl==1.5.0
     # via pygithub
-requests==2.31.0
+requests==2.32.3
     # via pygithub
 six==1.16.0
     # via asttokens
 stack-data==0.6.3
     # via ipython
-traitlets==5.14.1
+traitlets==5.14.3
     # via
     #   ipython
     #   matplotlib-inline
-typing-extensions==4.9.0
-    # via pygithub
+typing-extensions==4.12.1
+    # via
+    #   ipython
+    #   pygithub
 urllib3==1.26.18
     # via
     #   -r requirements-dev.in

requirements.in

@@ -6,7 +6,7 @@ django-modeltranslation
 flake8
 requests
 requests_cache
-git+https://github.com/City-of-Helsinki/[email protected].82#egg=django-munigeo
+git+https://github.com/City-of-Helsinki/[email protected].86#egg=django-munigeo
 pytz
 django-cors-headers
 django-extensions

requirements.txt

@@ -4,25 +4,25 @@
 #
 #    pip-compile requirements.in
 #
-asgiref==3.7.2
+asgiref==3.8.1
     # via
     #   django
     #   django-cors-headers
-attrs==23.2.0
+attrs==24.2.0
     # via
     #   cattrs
     #   jsonschema
     #   referencing
     #   requests-cache
-black==24.2.0
+black==24.8.0
     # via -r requirements.in
-bmi-arcgis-restapi==2.4.7
+bmi-arcgis-restapi==2.4.9
     # via -r requirements.in
-build==1.0.3
+build==1.2.1
     # via pip-tools
 cattrs==23.2.3
     # via requests-cache
-certifi==2024.2.2
+certifi==2024.7.4
     # via
     #   requests
     #   sentry-sdk
@@ -32,11 +32,9 @@ click==8.1.7
     # via
     #   black
     #   pip-tools
-coverage[toml]==7.4.1
-    # via
-    #   coverage
-    #   pytest-cov
-django==5.0.2
+coverage[toml]==7.6.1
+    # via pytest-cov
+django==5.1
     # via
     #   -r requirements.in
     #   django-cors-headers
@@ -48,49 +46,49 @@ django==5.0.2
     #   django-polymorphic
     #   djangorestframework
     #   drf-spectacular
-django-cors-headers==4.3.1
+django-cors-headers==4.4.0
     # via -r requirements.in
 django-environ==0.11.2
     # via -r requirements.in
 django-extensions==3.2.3
     # via -r requirements.in
-django-filter==23.5
+django-filter==24.3
     # via -r requirements.in
 django-js-asset==2.2.0
     # via django-mptt
-django-modeltranslation==0.18.11
+django-modeltranslation==0.19.7
     # via
     #   -r requirements.in
     #   django-munigeo
 django-mptt==0.16.0
     # via
     #   -r requirements.in
     #   django-munigeo
-django-munigeo @ git+https://github.com/City-of-Helsinki/[email protected].82
+django-munigeo @ git+https://github.com/City-of-Helsinki/[email protected].86
     # via -r requirements.in
 django-polymorphic==3.1.0
     # via -r requirements.in
-djangorestframework==3.14.0
+djangorestframework==3.15.2
     # via
     #   -r requirements.in
     #   drf-spectacular
 djangorestframework-jsonp==1.0.2
     # via -r requirements.in
-drf-spectacular==0.27.1
+drf-spectacular==0.27.2
     # via -r requirements.in
-exceptiongroup==1.2.0
+exceptiongroup==1.2.2
     # via
     #   cattrs
     #   pytest
-flake8==7.0.0
+flake8==7.1.1
     # via
     #   -r requirements.in
     #   pep8-naming
 geographiclib==2.0
     # via geopy
 geopy==2.4.1
     # via -r requirements.in
-idna==3.6
+idna==3.7
     # via requests
 inflection==0.5.1
     # via drf-spectacular
@@ -100,109 +98,105 @@ isort==5.13.2
     # via -r requirements.in
 jedi==0.19.1
     # via -r requirements.in
-jsonschema==4.21.1
+jsonschema==4.23.0
     # via drf-spectacular
 jsonschema-specifications==2023.12.1
     # via jsonschema
 libvoikko==4.3
     # via -r requirements.in
-lxml==5.1.0
+lxml==5.3.0
     # via -r requirements.in
 mccabe==0.7.0
     # via flake8
 munch==4.0.0
     # via bmi-arcgis-restapi
 mypy-extensions==1.0.0
     # via black
-packaging==23.2
+packaging==24.1
     # via
     #   black
     #   build
     #   pytest
-parso==0.8.3
+parso==0.8.4
     # via
     #   -r requirements.in
     #   jedi
 pathspec==0.12.1
     # via black
-pep8-naming==0.13.3
+pep8-naming==0.14.1
     # via -r requirements.in
-pip-tools==7.4.0
+pip-tools==7.4.1
     # via -r requirements.in
-platformdirs==4.2.0
+platformdirs==4.2.2
     # via
     #   black
     #   requests-cache
-pluggy==1.4.0
+pluggy==1.5.0
     # via pytest
 psycopg2==2.9.9
     # via -r requirements.in
-pycodestyle==2.11.1
+pycodestyle==2.12.1
     # via flake8
 pyflakes==3.2.0
     # via flake8
-pyproject-hooks==1.0.0
+pyproject-hooks==1.1.0
     # via
     #   build
     #   pip-tools
-pytest==8.0.1
+pytest==8.3.2
     # via
     #   pytest-cov
     #   pytest-django
-pytest-cov==4.1.0
+pytest-cov==5.0.0
     # via -r requirements.in
 pytest-django==4.8.0
     # via -r requirements.in
-python-dateutil==2.8.2
+python-dateutil==2.9.0.post0
     # via -r requirements.in
 pytz==2024.1
-    # via
-    #   -r requirements.in
-    #   djangorestframework
-pyyaml==6.0.1
+    # via -r requirements.in
+pyyaml==6.0.2
     # via
     #   django-munigeo
     #   drf-spectacular
-referencing==0.33.0
+referencing==0.35.1
     # via
     #   jsonschema
     #   jsonschema-specifications
-requests==2.31.0
+requests==2.32.3
     # via
     #   -r requirements.in
     #   bmi-arcgis-restapi
     #   django-munigeo
     #   requests-cache
     #   requests-mock
-requests-cache==1.2.0
+requests-cache==1.2.1
     # via -r requirements.in
-requests-mock==1.11.0
+requests-mock==1.12.1
     # via -r requirements.in
-rpds-py==0.18.0
+rpds-py==0.20.0
     # via
     #   jsonschema
     #   referencing
-sentry-sdk==1.40.5
+sentry-sdk==2.13.0
     # via -r requirements.in
 six==1.16.0
     # via
     #   django-munigeo
     #   python-dateutil
-    #   requests-mock
     #   url-normalize
-sqlparse==0.4.4
+sqlparse==0.5.1
     # via django
 tomli==2.0.1
     # via
     #   black
     #   build
     #   coverage
     #   pip-tools
-    #   pyproject-hooks
     #   pytest
-tqdm==4.66.2
+tqdm==4.66.5
     # via -r requirements.in
-typing-extensions==4.9.0
+typing-extensions==4.12.2
     # via
     #   asgiref
     #   black
@@ -214,16 +208,16 @@ uritemplate==4.1.1
     # via drf-spectacular
 url-normalize==1.4.3
     # via requests-cache
-urllib3==1.26.18
+urllib3==1.26.19
     # via
     #   -r requirements.in
     #   bmi-arcgis-restapi
     #   requests
     #   requests-cache
     #   sentry-sdk
-wheel==0.42.0
+wheel==0.44.0
     # via pip-tools
-whitenoise==6.6.0
+whitenoise==6.7.0
     # via -r requirements.in
 
 # The following packages are considered to be unsafe in a requirements file:

services/api.py

@@ -140,7 +140,7 @@ def __init__(self, *args, **kwargs):
             self.translated_fields = []
             return
 
-        self.translated_fields = trans_opts.fields.keys()
+        self.translated_fields = trans_opts.all_fields.keys()
         # Remove the pre-existing data in the bundle.
         for field_name in self.translated_fields:
             for lang in LANGUAGES:

services/fixtures/exclusion_words.json

@@ -0,0 +1,18 @@
+[
+  {
+    "model": "services.exclusionword",
+    "pk": 1,
+    "fields": {
+      "word": "katu",
+      "language_short": "fi"
+    }
+  },
+  {
+    "model": "services.exclusionword",
+    "pk": 2,
+    "fields": {
+      "word": "tie",
+      "language_short": "fi"
+    }
+  }
+]