Merge pull request #28 from praekeltfoundation/dependabot-security-alert

Dependabot security alert
praekeltfoundation · Aug 6, 2024 · 411bca9 · 411bca9
2 parents b7ca121 + 7a5ce42
commit 411bca9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.9', '3.10' ]
+        python-version: ['3.12']
         postgres_version: ['14']
     services:
       db:

diff --git a/flow_results/urls.py b/flow_results/urls.py
@@ -14,13 +14,13 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import include, path
+from django.urls import include, re_path
 
 from flows import urls as flow_urls
 
 urlpatterns = [
-    path("admin/", admin.site.urls),
-    path("health/", include("health_check.urls")),
-    path("", include("django_prometheus.urls")),
-    path("", include(flow_urls.urlpatterns)),
+    re_path("admin/", admin.site.urls),
+    re_path("health/", include("health_check.urls")),
+    # re_path("", include("django_prometheus.urls")),
+    re_path("", include(flow_urls.urlpatterns)),
 ]
diff --git a/flows/urls.py b/flows/urls.py
@@ -1,4 +1,4 @@
-from django.urls import include, path
+from django.urls import include, re_path
 from rest_framework_extensions.routers import ExtendedDefaultRouter
 
 from flows.views import FlowResponseViewSet, FlowViewSet
@@ -13,5 +13,5 @@
 )
 
 urlpatterns = [
-    path("api/v1/", include(v1router.urls)),
+    re_path("api/v1/", include(v1router.urls)),
 ]
diff --git a/setup.py b/setup.py
@@ -19,38 +19,40 @@
         "Bug Tracker": "https://github.com/praekeltfoundation/flow-results/issues",
         "Documentation": "https://floip.gitbook.io/flow-results-specification/",
     },
-    python_requires=">=3.6",
+    python_requires=">=3.9",
     classifiers=[
         "Development Status :: 3 - Alpha",
-        "Framework :: Django :: 3.1",
+        "Framework :: Django :: 4.2",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Communications :: Chat",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
     ],
     install_requires=[
-        "django==3.2.25",
+        "django==4.2",
         "django-environ==0.4.5",
-        "djangorestframework==3.12.2",
+        "djangorestframework==3.15.2",
         "drf-extensions==0.7.0",
         "django-health-check==3.16.3",
         "django-prometheus==2.1.0",
-        "psycopg2-binary==2.8.6",
+        "psycopg2-binary==2.9.9",
         "sentry-sdk==2.8.0",
-        "dj-database-url==2.1.0",
+        "dj-database-url==2.2.0",
         "python-dateutil==2.8.2",
+        "setuptools==72.1.0",
     ],
     extras_require={
         "dev": [
             "black==22.10.0",
             "isort==5.7.0",
-            "flake8==5.0.4",
+            "flake8==7.1.1",
             "coverage==5.5",
         ],
     },