Skip to content

Commit

Permalink
Merge pull request #221 from praekeltfoundation/dependabot-security-a…
Browse files Browse the repository at this point in the history
…lerts

update djangorestframework
  • Loading branch information
Buhle79 authored Aug 12, 2024
2 parents dd0ce34 + 177508a commit 7b71298
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 35 deletions.
2 changes: 1 addition & 1 deletion healthcheck/settings/dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion healthcheck/settings/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
32 changes: 17 additions & 15 deletions healthcheck/urls.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
isort==5.13.2
black==24.3.0
flake8==7.0.0
flake8==7.1.1
30 changes: 15 additions & 15 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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",
],
)

0 comments on commit 7b71298

Please sign in to comment.