diff --git a/Dockerfile b/Dockerfile index be06c13..a9e1c97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,6 @@ RUN set -eux; \ apt-get install -y \ build-essential \ gdal-bin \ - postgresql-client-11 \ build-essential \ libpq-dev \ gettext \ diff --git a/docker-compose.yml b/docker-compose.yml index 49e30fd..622f200 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: diff --git a/requirements.in b/requirements.in index d44cda9..85a8bfa 100644 --- a/requirements.in +++ b/requirements.in @@ -1,13 +1,13 @@ Celery coreapi -Django>=4.1,<4.2 +Django>=4.1,<4.3 django-celery-beat django-celery-results django-cors-headers django-extensions django-filter django-simple-history -djangorestframework +djangorestframework<3.16 drf-yasg flower gunicorn @@ -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 diff --git a/requirements.txt b/requirements.txt index 59bc427..2b9809d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,29 +6,35 @@ # amqp==5.2.0 # via kombu +anyio==4.4.0 + # via httpx asgiref==3.8.1 # via # django # django-cors-headers - # django-simple-history -azure-core==1.30.1 +async-property==0.2.2 + # via python-keycloak +azure-core==1.30.2 # via # azure-identity # opencensus-ext-azure -azure-identity==1.16.1 +azure-identity==1.17.1 # via opencensus-ext-azure billiard==4.2.0 # via celery cachetools==5.3.3 # via google-auth -celery==5.3.6 +celery==5.4.0 # via # -r requirements.in # django-celery-beat # django-celery-results # flower -certifi==2024.2.2 - # via requests +certifi==2024.6.2 + # via + # httpcore + # httpx + # requests cffi==1.16.0 # via cryptography charset-normalizer==3.3.2 @@ -52,7 +58,7 @@ coreschema==0.0.4 # via coreapi cron-descriptor==1.4.3 # via django-celery-beat -cryptography==42.0.5 +cryptography==42.0.8 # via # azure-identity # jwcrypto @@ -60,7 +66,7 @@ cryptography==42.0.5 # pyjwt deprecation==2.1.0 # via python-keycloak -django==4.1.13 +django==4.2.13 # via # -r requirements.in # django-celery-beat @@ -68,6 +74,7 @@ django==4.1.13 # django-cors-headers # django-extensions # django-filter + # django-simple-history # django-timezone-field # djangorestframework # drf-yasg @@ -76,17 +83,17 @@ django-celery-beat==2.6.0 # via -r requirements.in django-celery-results==2.5.1 # via -r requirements.in -django-cors-headers==4.3.1 +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.5.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 @@ -94,20 +101,29 @@ drf-yasg==1.21.7 # via -r requirements.in flower==2.0.1 # via -r requirements.in -google-api-core==2.18.0 +google-api-core==2.19.1 # via opencensus -google-auth==2.29.0 +google-auth==2.30.0 # via google-api-core -googleapis-common-protos==1.63.0 +googleapis-common-protos==1.63.2 # via google-api-core gunicorn==22.0.0 # via -r requirements.in h11==0.14.0 - # via uvicorn + # via + # httpcore + # uvicorn +httpcore==1.0.5 + # via httpx +httpx==0.27.0 + # via python-keycloak humanize==4.9.0 # via flower idna==3.7 - # via requests + # via + # anyio + # httpx + # requests inflection==0.5.1 # via drf-yasg itypes==1.2.0 @@ -120,11 +136,11 @@ kombu==5.3.7 # via celery markupsafe==2.1.5 # via jinja2 -msal==1.28.0 +msal==1.29.0 # via # azure-identity # msal-extensions -msal-extensions==1.1.0 +msal-extensions==1.2.0 # via azure-identity opencensus==0.11.4 # via @@ -148,31 +164,30 @@ opencensus-ext-postgresql==0.1.3 # via -r requirements.in opencensus-ext-requests==0.8.0 # via -r requirements.in -packaging==24.0 +packaging==24.1 # via # deprecation # drf-yasg # gunicorn - # msal-extensions -portalocker==2.8.2 +portalocker==2.10.0 # via msal-extensions prometheus-client==0.20.0 # via flower -prompt-toolkit==3.0.43 +prompt-toolkit==3.0.47 # via click-repl -proto-plus==1.23.0 +proto-plus==1.24.0 # via google-api-core -protobuf==4.25.3 +protobuf==5.27.2 # via # google-api-core # googleapis-common-protos # proto-plus -psutil==5.9.8 +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 @@ -185,13 +200,13 @@ pyjwt[crypto]==2.8.0 # via # msal # pyjwt -python-crontab==3.0.0 +python-crontab==3.1.0 # via django-celery-beat python-dateutil==2.9.0.post0 # via # celery # python-crontab -python-keycloak==3.12.0 +python-keycloak==4.2.0 # via -r requirements.in pytz==2024.1 # via @@ -199,7 +214,7 @@ pytz==2024.1 # flower pyyaml==6.0.1 # via drf-yasg -requests==2.32.0 +requests==2.32.3 # via # -r requirements.in # azure-core @@ -219,13 +234,18 @@ six==1.16.0 # azure-core # opencensus # python-dateutil +sniffio==1.3.1 + # via + # anyio + # httpx sqlparse==0.5.0 # via django tornado==6.4.1 # via flower -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # azure-core + # azure-identity # jwcrypto tzdata==2024.1 # via @@ -239,7 +259,7 @@ urllib3==1.26.19 # via # -r requirements.in # requests -uvicorn==0.29.0 +uvicorn==0.30.1 # via -r requirements.in vine==5.1.0 # via @@ -248,7 +268,7 @@ vine==5.1.0 # kombu wcwidth==0.2.13 # via prompt-toolkit -whitenoise==6.6.0 +whitenoise==6.7.0 # via -r requirements.in wrapt==1.16.0 # via opencensus-ext-requests diff --git a/requirements_dev.txt b/requirements_dev.txt index 58404ea..cd4807c 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -8,18 +8,25 @@ amqp==5.2.0 # via # -r ./requirements_test.txt # kombu +anyio==4.4.0 + # via + # -r ./requirements_test.txt + # httpx asgiref==3.8.1 # via # -r ./requirements_test.txt # django # django-cors-headers - # django-simple-history -azure-core==1.30.1 +async-property==0.2.2 + # via + # -r ./requirements_test.txt + # python-keycloak +azure-core==1.30.2 # via # -r ./requirements_test.txt # azure-identity # opencensus-ext-azure -azure-identity==1.16.1 +azure-identity==1.17.1 # via # -r ./requirements_test.txt # opencensus-ext-azure @@ -34,15 +41,17 @@ cachetools==5.3.3 # -r ./requirements_test.txt # google-auth # tox -celery==5.3.6 +celery==5.4.0 # via # -r ./requirements_test.txt # django-celery-beat # django-celery-results # flower -certifi==2024.2.2 +certifi==2024.6.2 # via # -r ./requirements_test.txt + # httpcore + # httpx # requests cffi==1.16.0 # via @@ -87,7 +96,7 @@ coreschema==0.0.4 # via # -r ./requirements_test.txt # coreapi -coverage[toml]==7.4.4 +coverage[toml]==7.5.4 # via # -r ./requirements_test.txt # pytest-cov @@ -95,7 +104,7 @@ cron-descriptor==1.4.3 # via # -r ./requirements_test.txt # django-celery-beat -cryptography==42.0.5 +cryptography==42.0.8 # via # -r ./requirements_test.txt # azure-identity @@ -110,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 @@ -119,6 +128,7 @@ django==4.1.13 # django-debug-toolbar # django-extensions # django-filter + # django-simple-history # django-timezone-field # djangorestframework # drf-yasg @@ -127,21 +137,21 @@ django-celery-beat==2.6.0 # via -r ./requirements_test.txt django-celery-results==2.5.1 # via -r ./requirements_test.txt -django-cors-headers==4.3.1 +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.5.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 @@ -149,30 +159,30 @@ drf-yasg==1.21.7 # via -r ./requirements_test.txt factory-boy==3.3.0 # via -r ./requirements_test.txt -faker==24.9.0 +faker==26.0.0 # via # -r ./requirements_test.txt # factory-boy -filelock==3.13.4 +filelock==3.15.4 # via # -r ./requirements_test.txt # tox # virtualenv -flake8==7.0.0 +flake8==7.1.0 # via -r ./requirements_test.txt flower==2.0.1 # via -r ./requirements_test.txt -freezegun==1.4.0 +freezegun==1.5.1 # via -r ./requirements_test.txt -google-api-core==2.18.0 +google-api-core==2.19.1 # via # -r ./requirements_test.txt # opencensus -google-auth==2.29.0 +google-auth==2.30.0 # via # -r ./requirements_test.txt # google-api-core -googleapis-common-protos==1.63.0 +googleapis-common-protos==1.63.2 # via # -r ./requirements_test.txt # google-api-core @@ -181,7 +191,16 @@ gunicorn==22.0.0 h11==0.14.0 # via # -r ./requirements_test.txt + # httpcore # uvicorn +httpcore==1.0.5 + # via + # -r ./requirements_test.txt + # httpx +httpx==0.27.0 + # via + # -r ./requirements_test.txt + # python-keycloak humanize==4.9.0 # via # -r ./requirements_test.txt @@ -189,6 +208,8 @@ humanize==4.9.0 idna==3.7 # via # -r ./requirements_test.txt + # anyio + # httpx # requests # yarl inflection==0.5.1 @@ -225,12 +246,12 @@ mccabe==0.7.0 # via # -r ./requirements_test.txt # flake8 -msal==1.28.0 +msal==1.29.0 # via # -r ./requirements_test.txt # azure-identity # msal-extensions -msal-extensions==1.1.0 +msal-extensions==1.2.0 # via # -r ./requirements_test.txt # azure-identity @@ -260,30 +281,29 @@ opencensus-ext-postgresql==0.1.3 # via -r ./requirements_test.txt opencensus-ext-requests==0.8.0 # via -r ./requirements_test.txt -packaging==24.0 +packaging==24.1 # via # -r ./requirements_test.txt # build # deprecation # drf-yasg # gunicorn - # msal-extensions # pyproject-api # pytest # tox pip-tools==7.4.1 # via -r requirements_dev.in -platformdirs==4.2.0 +platformdirs==4.2.2 # via # -r ./requirements_test.txt # tox # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via # -r ./requirements_test.txt # pytest # tox -portalocker==2.8.2 +portalocker==2.10.0 # via # -r ./requirements_test.txt # msal-extensions @@ -291,26 +311,24 @@ prometheus-client==0.20.0 # via # -r ./requirements_test.txt # flower -prompt-toolkit==3.0.43 +prompt-toolkit==3.0.47 # via # -r ./requirements_test.txt # click-repl -proto-plus==1.23.0 +proto-plus==1.24.0 # via # -r ./requirements_test.txt # google-api-core -protobuf==4.25.3 +protobuf==5.27.2 # via # -r ./requirements_test.txt # google-api-core # googleapis-common-protos # proto-plus -psutil==5.9.8 +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 @@ -324,7 +342,7 @@ pyasn1-modules==0.4.0 # via # -r ./requirements_test.txt # google-auth -pycodestyle==2.11.1 +pycodestyle==2.12.0 # via # -r ./requirements_test.txt # flake8 @@ -340,15 +358,15 @@ pyjwt[crypto]==2.8.0 # via # -r ./requirements_test.txt # msal -pyproject-api==1.6.1 +pyproject-api==1.7.1 # via # -r ./requirements_test.txt # tox -pyproject-hooks==1.0.0 +pyproject-hooks==1.1.0 # via # build # pip-tools -pytest==8.1.1 +pytest==8.2.2 # via # -r ./requirements_test.txt # pytest-cov @@ -357,7 +375,7 @@ pytest-cov==5.0.0 # via -r ./requirements_test.txt pytest-django==4.8.0 # via -r ./requirements_test.txt -python-crontab==3.0.0 +python-crontab==3.1.0 # via # -r ./requirements_test.txt # django-celery-beat @@ -368,7 +386,7 @@ python-dateutil==2.9.0.post0 # faker # freezegun # python-crontab -python-keycloak==3.12.0 +python-keycloak==4.2.0 # via -r ./requirements_test.txt pytz==2024.1 # via @@ -380,7 +398,7 @@ pyyaml==6.0.1 # -r ./requirements_test.txt # drf-yasg # vcrpy -requests==2.32.0 +requests==2.32.3 # via # -r ./requirements_test.txt # azure-core @@ -405,6 +423,11 @@ six==1.16.0 # azure-core # opencensus # python-dateutil +sniffio==1.3.1 + # via + # -r ./requirements_test.txt + # anyio + # httpx sqlparse==0.5.0 # via # -r ./requirements_test.txt @@ -414,12 +437,13 @@ tornado==6.4.1 # via # -r ./requirements_test.txt # flower -tox==4.14.2 +tox==4.15.1 # via -r ./requirements_test.txt -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -r ./requirements_test.txt # azure-core + # azure-identity # jwcrypto tzdata==2024.1 # via @@ -435,7 +459,7 @@ urllib3==1.26.19 # via # -r ./requirements_test.txt # requests -uvicorn==0.29.0 +uvicorn==0.30.1 # via -r ./requirements_test.txt vcrpy==6.0.1 # via -r ./requirements_test.txt @@ -445,7 +469,7 @@ vine==5.1.0 # amqp # celery # kombu -virtualenv==20.25.1 +virtualenv==20.26.3 # via # -r ./requirements_test.txt # tox @@ -455,7 +479,7 @@ wcwidth==0.2.13 # prompt-toolkit wheel==0.43.0 # via pip-tools -whitenoise==6.6.0 +whitenoise==6.7.0 # via -r ./requirements_test.txt wrapt==1.16.0 # via diff --git a/requirements_test.txt b/requirements_test.txt index 837ba33..bf66751 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -8,18 +8,25 @@ amqp==5.2.0 # via # -r ./requirements.txt # kombu +anyio==4.4.0 + # via + # -r ./requirements.txt + # httpx asgiref==3.8.1 # via # -r ./requirements.txt # django # django-cors-headers - # django-simple-history -azure-core==1.30.1 +async-property==0.2.2 + # via + # -r ./requirements.txt + # python-keycloak +azure-core==1.30.2 # via # -r ./requirements.txt # azure-identity # opencensus-ext-azure -azure-identity==1.16.1 +azure-identity==1.17.1 # via # -r ./requirements.txt # opencensus-ext-azure @@ -32,15 +39,17 @@ cachetools==5.3.3 # -r ./requirements.txt # google-auth # tox -celery==5.3.6 +celery==5.4.0 # via # -r ./requirements.txt # django-celery-beat # django-celery-results # flower -certifi==2024.2.2 +certifi==2024.6.2 # via # -r ./requirements.txt + # httpcore + # httpx # requests cffi==1.16.0 # via @@ -80,13 +89,13 @@ coreschema==0.0.4 # via # -r ./requirements.txt # coreapi -coverage[toml]==7.4.4 +coverage[toml]==7.5.4 # via pytest-cov cron-descriptor==1.4.3 # via # -r ./requirements.txt # django-celery-beat -cryptography==42.0.5 +cryptography==42.0.8 # via # -r ./requirements.txt # azure-identity @@ -99,7 +108,7 @@ 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 @@ -107,6 +116,7 @@ django==4.1.13 # django-cors-headers # django-extensions # django-filter + # django-simple-history # django-timezone-field # djangorestframework # drf-yasg @@ -115,19 +125,19 @@ django-celery-beat==2.6.0 # via -r ./requirements.txt django-celery-results==2.5.1 # via -r ./requirements.txt -django-cors-headers==4.3.1 +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.5.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 @@ -135,27 +145,27 @@ drf-yasg==1.21.7 # via -r ./requirements.txt factory-boy==3.3.0 # via -r requirements_test.in -faker==24.9.0 +faker==26.0.0 # via factory-boy -filelock==3.13.4 +filelock==3.15.4 # via # tox # virtualenv -flake8==7.0.0 +flake8==7.1.0 # via -r requirements_test.in flower==2.0.1 # via -r ./requirements.txt -freezegun==1.4.0 +freezegun==1.5.1 # via -r requirements_test.in -google-api-core==2.18.0 +google-api-core==2.19.1 # via # -r ./requirements.txt # opencensus -google-auth==2.29.0 +google-auth==2.30.0 # via # -r ./requirements.txt # google-api-core -googleapis-common-protos==1.63.0 +googleapis-common-protos==1.63.2 # via # -r ./requirements.txt # google-api-core @@ -164,7 +174,16 @@ gunicorn==22.0.0 h11==0.14.0 # via # -r ./requirements.txt + # httpcore # uvicorn +httpcore==1.0.5 + # via + # -r ./requirements.txt + # httpx +httpx==0.27.0 + # via + # -r ./requirements.txt + # python-keycloak humanize==4.9.0 # via # -r ./requirements.txt @@ -172,6 +191,8 @@ humanize==4.9.0 idna==3.7 # via # -r ./requirements.txt + # anyio + # httpx # requests # yarl inflection==0.5.1 @@ -204,12 +225,12 @@ markupsafe==2.1.5 # jinja2 mccabe==0.7.0 # via flake8 -msal==1.28.0 +msal==1.29.0 # via # -r ./requirements.txt # azure-identity # msal-extensions -msal-extensions==1.1.0 +msal-extensions==1.2.0 # via # -r ./requirements.txt # azure-identity @@ -237,25 +258,24 @@ opencensus-ext-postgresql==0.1.3 # via -r ./requirements.txt opencensus-ext-requests==0.8.0 # via -r ./requirements.txt -packaging==24.0 +packaging==24.1 # via # -r ./requirements.txt # deprecation # drf-yasg # gunicorn - # msal-extensions # pyproject-api # pytest # tox -platformdirs==4.2.0 +platformdirs==4.2.2 # via # tox # virtualenv -pluggy==1.4.0 +pluggy==1.5.0 # via # pytest # tox -portalocker==2.8.2 +portalocker==2.10.0 # via # -r ./requirements.txt # msal-extensions @@ -263,26 +283,24 @@ prometheus-client==0.20.0 # via # -r ./requirements.txt # flower -prompt-toolkit==3.0.43 +prompt-toolkit==3.0.47 # via # -r ./requirements.txt # click-repl -proto-plus==1.23.0 +proto-plus==1.24.0 # via # -r ./requirements.txt # google-api-core -protobuf==4.25.3 +protobuf==5.27.2 # via # -r ./requirements.txt # google-api-core # googleapis-common-protos # proto-plus -psutil==5.9.8 +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 @@ -296,7 +314,7 @@ pyasn1-modules==0.4.0 # via # -r ./requirements.txt # google-auth -pycodestyle==2.11.1 +pycodestyle==2.12.0 # via flake8 pycparser==2.22 # via @@ -308,9 +326,9 @@ pyjwt[crypto]==2.8.0 # via # -r ./requirements.txt # msal -pyproject-api==1.6.1 +pyproject-api==1.7.1 # via tox -pytest==8.1.1 +pytest==8.2.2 # via # -r requirements_test.in # pytest-cov @@ -319,7 +337,7 @@ pytest-cov==5.0.0 # via -r requirements_test.in pytest-django==4.8.0 # via -r requirements_test.in -python-crontab==3.0.0 +python-crontab==3.1.0 # via # -r ./requirements.txt # django-celery-beat @@ -330,7 +348,7 @@ python-dateutil==2.9.0.post0 # faker # freezegun # python-crontab -python-keycloak==3.12.0 +python-keycloak==4.2.0 # via -r ./requirements.txt pytz==2024.1 # via @@ -342,7 +360,7 @@ pyyaml==6.0.1 # -r ./requirements.txt # drf-yasg # vcrpy -requests==2.32.0 +requests==2.32.3 # via # -r ./requirements.txt # azure-core @@ -367,6 +385,11 @@ six==1.16.0 # azure-core # opencensus # python-dateutil +sniffio==1.3.1 + # via + # -r ./requirements.txt + # anyio + # httpx sqlparse==0.5.0 # via # -r ./requirements.txt @@ -375,12 +398,13 @@ tornado==6.4.1 # via # -r ./requirements.txt # flower -tox==4.14.2 +tox==4.15.1 # via -r requirements_test.in -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -r ./requirements.txt # azure-core + # azure-identity # jwcrypto tzdata==2024.1 # via @@ -396,7 +420,7 @@ urllib3==1.26.19 # via # -r ./requirements.txt # requests -uvicorn==0.29.0 +uvicorn==0.30.1 # via -r ./requirements.txt vcrpy==6.0.1 # via -r requirements_test.in @@ -406,13 +430,13 @@ vine==5.1.0 # amqp # celery # kombu -virtualenv==20.25.1 +virtualenv==20.26.3 # via tox wcwidth==0.2.13 # via # -r ./requirements.txt # prompt-toolkit -whitenoise==6.6.0 +whitenoise==6.7.0 # via -r ./requirements.txt wrapt==1.16.0 # via