Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependabot security alert #28

Merged
merged 19 commits into from
Aug 6, 2024
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions flow_results/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
]
4 changes: 2 additions & 2 deletions flows/urls.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -13,5 +13,5 @@
)

urlpatterns = [
path("api/v1/", include(v1router.urls)),
re_path("api/v1/", include(v1router.urls)),
]
16 changes: 9 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
},
Expand Down
Loading