diff --git a/healthcheck/settings/dev.py b/healthcheck/settings/dev.py index 5054a80..4bab297 100755 --- a/healthcheck/settings/dev.py +++ b/healthcheck/settings/dev.py @@ -7,4 +7,4 @@ default="postgis://postgres:postgres@localhost:5432/healthcheck" ) } -ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", default="*") # noqa: F405 +ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", default=["*"]) # noqa: F405 diff --git a/healthcheck/settings/test.py b/healthcheck/settings/test.py index f6b9299..d93ec09 100755 --- a/healthcheck/settings/test.py +++ b/healthcheck/settings/test.py @@ -12,5 +12,5 @@ CELERY_TASK_ALWAYS_EAGER = True PROMETHEUS_EXPORT_MIGRATIONS = False -ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", default="*") # noqa: F405 +ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", default=["*"]) # noqa: F405 SOFT_COMMITMENT_PLUS_LIMIT = 3 diff --git a/healthcheck/urls.py b/healthcheck/urls.py index cf90e72..897e00a 100755 --- a/healthcheck/urls.py +++ b/healthcheck/urls.py @@ -1,5 +1,5 @@ from django.contrib import admin -from django.urls import include, path # noqa: F401 +from django.urls import include, re_path # noqa: F401 from django.conf import settings from django.conf.urls.static import static from rest_framework import routers @@ -25,20 +25,22 @@ global_v2router.registry.extend(real411_v2router.registry) urlpatterns = [ - path("schema/", SpectacularAPIView.as_view(), name="schema"), - path("docs/", SpectacularSwaggerView.as_view(url_name="schema"), name="swagger-ui"), - path("prometheus/", include("django_prometheus.urls")), - path("ht/", include("health_check.urls")), - path("admin/", admin.site.urls), - path("v1/", include("contacts.urls", namespace="api")), - path("v1/", include("selfswab.urls", namespace="api2")), - path("v1/", include("tbconnect.urls", namespace="api3")), - path("v1/", include("clinicfinder.urls")), - path("v2/", include(global_v2router.urls)), - path("v3/", include(v3router.urls)), - path("v4/", include(v4router.urls)), - path("api/v5/", include(v5router.urls)), - path("v1/vaxchamps/", include("vaxchamps.urls")), + re_path("schema/", SpectacularAPIView.as_view(), name="schema"), + re_path( + "docs/", SpectacularSwaggerView.as_view(url_name="schema"), name="swagger-ui" + ), + re_path("prometheus/", include("django_prometheus.urls")), + re_path("ht/", include("health_check.urls")), + re_path("admin/", admin.site.urls), + re_path("v1/", include("contacts.urls", namespace="api")), + re_path("v1/", include("selfswab.urls", namespace="api2")), + re_path("v1/", include("tbconnect.urls", namespace="api3")), + re_path("v1/", include("clinicfinder.urls")), + re_path("v2/", include(global_v2router.urls)), + re_path("v3/", include(v3router.urls)), + re_path("v4/", include(v4router.urls)), + re_path("api/v5/", include(v5router.urls)), + re_path("v1/vaxchamps/", include("vaxchamps.urls")), ] # Need to add this for media files to work for development diff --git a/requirements-dev.txt b/requirements-dev.txt index 61cc561..472b0f3 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,3 +1,3 @@ isort==5.13.2 black==24.3.0 -flake8==7.0.0 +flake8==7.1.1 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 1e3853e..7eb2870 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,45 +1,45 @@ -amqp==5.0.9 +amqp==5.2.0 appdirs==1.4.4 argh==0.26.2 -asgiref==3.3.2 +asgiref==3.6.0 attrs==22.2.0 Babel==2.9.1 -billiard==3.6.4.0 +billiard==4.2.0 black==24.3.0 -celery==5.2.3 +celery==5.4.0 certifi==2024.7.04 chardet==3.0.4 -click==8.0.3 -Django==3.2.25 +click==8.1.2 +Django==4.2 django-cors-headers==3.4.0 django-environ==0.4.5 django-filter==2.4.0 django-health-check==3.16.3 -django-phonenumber-field==4.0.0 -django-prometheus==2.1.0 +django-phonenumber-field==8.0.0 +django-prometheus==2.3.1 django_redis==4.12.1 django-rest-auth==0.9.5 -djangorestframework==3.11.2 +djangorestframework==3.15.2 djangorestframework-gis==1.0 -flake8==3.8.1 +flake8==7.1.1 future==0.18.3 google-cloud-bigquery==1.27.2 idna==3.7 importlib-metadata==1.7.0 iso6709==0.1.5 isort==5.13.2 -kombu==5.2.3 +kombu==5.4.0 Markdown==3.2.2 -mccabe==0.6.1 +mccabe==0.7.0 numpy==1.26.4 pathspec==0.9.0 pathtools==0.1.2 phonenumbers==8.12.6 prometheus-client==0.8.0 psycopg2==2.9.9 -pycodestyle==2.6.0 +pycodestyle==2.12.1 pycountry==20.7.3 -pyflakes==2.2.0 +pyflakes==3.2.0 pytz==2021.3 PyYAML==5.4 rapidpro-python==2.6.1 @@ -53,7 +53,7 @@ sqlparse==0.5.0 toml==0.10.1 typed-ast==1.4.1 urllib3==1.26.19 -vine==5.0.0 +vine==5.1.0 watchdog==0.10.3 zipp==3.19.1 opencv-python-headless==4.5.2.54 diff --git a/setup.py b/setup.py index 76108aa..0628b90 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,8 @@ "psycopg2==2.9.9", "requests==2.32.0", "rapidpro-python==2.6.1", - "django-import-export==2.5.0", + "django-import-export==4.1.1", + "setuptools==72.1.0", ] try: @@ -37,7 +38,7 @@ "Framework :: Django", "License :: OSI Approved :: BSD License", "Programming Language :: Python", - "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.9", "Topic :: Software Development :: Libraries :: Python Modules", ], )