Skip to content

Commit b16f910

Browse files
committed
Fix build
1 parent 19b6b70 commit b16f910

File tree

8 files changed

+40
-31
lines changed

8 files changed

+40
-31
lines changed

.github/workflows/check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v3
1313
- uses: actions/setup-python@v4
1414
with:
15-
python-version: '3.11'
15+
python-version: '3.14'
1616
cache: 'pip'
1717
- run: pip install -r requirements.txt
1818
- name: ruff
@@ -43,7 +43,7 @@ jobs:
4343
- uses: actions/checkout@v3
4444
- uses: actions/setup-python@v4
4545
with:
46-
python-version: '3.11'
46+
python-version: '3.14'
4747
cache: 'pip'
4848
- run: cp .env.example .env
4949
- run: pip install -r requirements.txt

causes_service/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.10.2-slim-bullseye
1+
FROM python:3.14.3-slim-trixie
22

33
ENV PIP_DISABLE_PIP_VERSION_CHECK 1
44
ENV PYTHONDONTWRITEBYTECODE 1

causes_service/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ up:
88
./manage.py runserver 0.0.0.0:8000
99

1010
build:
11+
npm install
1112
make styles-build
1213
make generate_app_links_client
1314

causes_service/admin/widgets.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from django.template.loader import get_template
2-
from unfold.admin import UnfoldAdminTextareaWidget
3-
from unfold.widgets import TEXTAREA_CLASSES, PROSE_CLASSES
2+
from unfold.widgets import TEXTAREA_CLASSES, PROSE_CLASSES, UnfoldAdminTextareaWidget
43

54
from now_u_api.settings import BASE_URL
65

causes_service/now_u_api/settings.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ def get_required_env(name: str) -> str:
9393

9494
# Health checks
9595
'health_check',
96-
'health_check.db',
97-
'health_check.storage',
98-
'health_check.contrib.migrations',
9996
]
10097

10198
MIDDLEWARE = [

causes_service/now_u_api/urls.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
from django.conf.urls.static import static
2727
from rest_framework import routers
2828
from drf_spectacular.views import SpectacularAPIView, SpectacularRedocView
29+
from health_check.views import HealthCheckView
2930

3031
router = routers.DefaultRouter()
3132
router.register(r'actions', causeViews.ActionViewSet, basename='action')
@@ -53,7 +54,15 @@
5354
re_path(r'^saml2_auth/', include('django_saml2_auth.urls')),
5455
re_path(r'^admin/login/$', django_saml2_auth.views.signin),
5556

56-
path(r'health/', include('health_check.urls')),
57+
path(
58+
r'health/',
59+
HealthCheckView.as_view(
60+
checks=[
61+
"health_check.Database",
62+
"health_check.Storage",
63+
]
64+
),
65+
),
5766
]
5867

5968
# In debug mode we serve static files

causes_service/requirements.txt

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,47 @@
1-
django==5.1
2-
djangorestframework==3.14.0
3-
Pillow==9.5.0
4-
grafana-django-saml2-auth==3.11.0
5-
pyjwt==2.7.0
1+
setuptools
2+
3+
django==6.0.2
4+
djangorestframework==3.16.1
5+
Pillow==12.1.1
6+
grafana-django-saml2-auth==3.20.0
7+
pyjwt==2.10.1
68
# TODO This adds 200mb to the image!! Is there a better way?
7-
psycopg2-binary==2.9.6
9+
psycopg2-binary==2.9.11
810

9-
meilisearch==0.31.5
11+
meilisearch==0.40.0
1012
mailchimp-marketing==3.0.80
11-
supabase==2.7.3
13+
supabase==2.28.0
14+
websockets==15
1215

13-
django-log-request-id==2.1.0
16+
django-log-request-id==2.1.1
1417

1518
## Openapi generator (probably dev/build dep)
1619
pyyaml
1720
uritemplate
1821
drf-spectacular
1922

20-
python-dotenv==1.0.0
21-
django-storages[azure]==1.13
23+
python-dotenv==1.2.1
24+
django-storages[azure]==1.14.6
2225

2326
## Admin
2427
django-unfold==0.81.0
2528

26-
django-cors-headers==4.2.0
29+
django-cors-headers==4.9.0
2730

28-
sentry-sdk[django]==1.38.0
31+
sentry-sdk[django]==2.53.0
2932

30-
django-health-check==3.18.3
33+
django-health-check==4.0.6
3134

3235
## dev deps TODO move
3336

3437
### Testing deps
35-
pytest==7.4.0
36-
pytest-django==4.5.2
37-
factory_boy==3.2.1
38+
pytest==9.0.2
39+
pytest-django==4.12.0
40+
factory-boy==3.3.3
3841

3942
## Linting deps
40-
mypy==1.11.0
41-
django-stubs[compatible-mypy]==5.1.0
42-
djangorestframework-stubs==3.15.1
43+
mypy==1.19.1
44+
django-stubs[compatible-mypy]==5.2.9
45+
djangorestframework-stubs==3.16.8
4346

44-
ruff==0.0.287
47+
ruff==0.15.4

causes_service/tests/factories/blog.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Meta:
2727
model = Blog
2828

2929
@factory.post_generation
30-
def authors(self, create, extracted, **kwargs):
30+
def authors(self, create, extracted, **kwargs): # noqa: F811
3131
if not create:
3232
# Simple build, or nothing to add, do nothing.
3333
return

0 commit comments

Comments
 (0)