Merge branch 'develop'

Dockerfile

@@ -11,6 +11,7 @@ RUN apt-get update && \
 
 COPY requirements.txt .
 
+RUN pip install --upgrade pip setuptools
 RUN pip install --no-cache-dir -r requirements.txt
 
 COPY . .

requirements-dev.txt

@@ -6,15 +6,15 @@
 #
 asttokens==2.4.1
     # via stack-data
-certifi==2023.11.17
+certifi==2024.2.2
     # via requests
 cffi==1.16.0
     # via
     #   cryptography
     #   pynacl
 charset-normalizer==3.3.2
     # via requests
-cryptography==42.0.1
+cryptography==42.0.3
     # via pyjwt
 decorator==5.1.1
     # via ipython
@@ -26,7 +26,7 @@ executing==2.0.1
     # via stack-data
 idna==3.6
     # via requests
-ipython==8.20.0
+ipython==8.21.0
     # via -r requirements-dev.in
 jedi==0.19.1
     # via ipython
@@ -44,7 +44,7 @@ pure-eval==0.2.2
     # via stack-data
 pycparser==2.21
     # via cffi
-pygithub==2.1.1
+pygithub==2.2.0
     # via -r requirements-dev.in
 pygments==2.17.2
     # via ipython
@@ -54,14 +54,10 @@ pyjwt[crypto]==2.8.0
     #   pyjwt
 pynacl==1.5.0
     # via pygithub
-python-dateutil==2.8.2
-    # via pygithub
 requests==2.31.0
     # via pygithub
 six==1.16.0
-    # via
-    #   asttokens
-    #   python-dateutil
+    # via asttokens
 stack-data==0.6.3
     # via ipython
 traitlets==5.14.1

requirements.txt

@@ -14,15 +14,15 @@ attrs==23.2.0
     #   jsonschema
     #   referencing
     #   requests-cache
-black==24.1.1
+black==24.2.0
     # via -r requirements.in
-bmi-arcgis-restapi==2.4.5
+bmi-arcgis-restapi==2.4.7
     # via -r requirements.in
 build==1.0.3
     # via pip-tools
 cattrs==23.2.3
     # via requests-cache
-certifi==2023.11.17
+certifi==2024.2.2
     # via
     #   requests
     #   sentry-sdk
@@ -36,7 +36,7 @@ coverage[toml]==7.4.1
     # via
     #   coverage
     #   pytest-cov
-django==5.0.1
+django==5.0.2
     # via
     #   -r requirements.in
     #   django-cors-headers
@@ -127,9 +127,9 @@ pathspec==0.12.1
     # via black
 pep8-naming==0.13.3
     # via -r requirements.in
-pip-tools==7.3.0
+pip-tools==7.4.0
     # via -r requirements.in
-platformdirs==4.1.0
+platformdirs==4.2.0
     # via
     #   black
     #   requests-cache
@@ -142,18 +142,20 @@ pycodestyle==2.11.1
 pyflakes==3.2.0
     # via flake8
 pyproject-hooks==1.0.0
-    # via build
-pytest==8.0.0
+    # via
+    #   build
+    #   pip-tools
+pytest==8.0.1
     # via
     #   pytest-cov
     #   pytest-django
 pytest-cov==4.1.0
     # via -r requirements.in
-pytest-django==4.7.0
+pytest-django==4.8.0
     # via -r requirements.in
 python-dateutil==2.8.2
     # via -r requirements.in
-pytz==2023.4
+pytz==2024.1
     # via
     #   -r requirements.in
     #   djangorestframework
@@ -172,15 +174,15 @@ requests==2.31.0
     #   django-munigeo
     #   requests-cache
     #   requests-mock
-requests-cache==1.1.1
+requests-cache==1.2.0
     # via -r requirements.in
 requests-mock==1.11.0
     # via -r requirements.in
-rpds-py==0.17.1
+rpds-py==0.18.0
     # via
     #   jsonschema
     #   referencing
-sentry-sdk==1.39.2
+sentry-sdk==1.40.5
     # via -r requirements.in
 six==1.16.0
     # via
@@ -198,15 +200,15 @@ tomli==2.0.1
     #   pip-tools
     #   pyproject-hooks
     #   pytest
-tqdm==4.66.1
+tqdm==4.66.2
     # via -r requirements.in
 typing-extensions==4.9.0
     # via
     #   asgiref
     #   black
     #   cattrs
     #   django-modeltranslation
-tzdata==2023.4
+tzdata==2024.1
     # via -r requirements.in
 uritemplate==4.1.1
     # via drf-spectacular

scripts/run_imports.sh

@@ -6,19 +6,20 @@ function stage_0 {
     # Execute every 6 months
     # Finnish municipalities
     ./manage.py geo_import finland --municipalities
-    # Parking areas, Statistical districts
-    ./manage.py update_parking_areas
+    # Statistical districts
     ./manage.py update_statistical_districts
 }
 
 function stage_1 {
     # Execute once a week
     # Helsinki, Espoo and HSY Administrative divisions and Addresses
+    # Parking areas
     #./manage.py geo_import helsinki --divisions
     #./manage.py geo_import espoo --divisions
     GDAL_HTTP_UNSAFESSL=YES ./manage.py geo_import hsy --divisions
     ./manage.py geo_import helsinki --addresses
     ./manage.py geo_import uusimaa --addresses
+    ./manage.py update_parking_areas
     ./manage.py update_vantaa_parking_areas
     ./manage.py update_vantaa_parking_payzones
     ./manage.py index_search_columns

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="smbackend",
-    version="240220",
+    version="240228",
     license="AGPLv3",
     packages=find_packages(),
     include_package_data=True,