Skip to content

Commit 740dff9

Browse files
Merge pull request #2063 from betagouv/chore/bump-django
chore(deps): upgrade django to version 5.2.13 and python-dotenv to 1.2.2
2 parents d1909fc + 759a01c commit 740dff9

4 files changed

Lines changed: 23 additions & 19 deletions

File tree

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies = [
1515
"beautifulsoup4==4.12.3",
1616
"celery==5.4.0",
1717
"cryptography==46.0.7",
18-
"django>=5.1.15,<5.2",
18+
"django>=5.2.1,<6",
1919
"django-activity-stream",
2020
"django-admin-csvexport==2.2",
2121
"django-allauth[mfa,openid,socialaccount]==65.14.1",
@@ -234,7 +234,7 @@ dev = [
234234
"pytest-subtests==0.11.0",
235235
"pytest-sugar==1.0.0",
236236
"pytest-xdist==3.5.0",
237-
"python-dotenv>=1.0.1",
237+
"python-dotenv>=1.2.2",
238238
"pytz>=2025.1",
239239
"requests-mock==1.12.1",
240240
"responses==0.25.3",

recoco/apps/metrics/tests/test_processor.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ def test_create(self, settings):
6161
view.set_cursor(mock_cursor)
6262
view.create()
6363

64-
assert mock_cursor.execute.call_args_list == [
64+
expected = [
6565
call(sql="CREATE SCHEMA IF NOT EXISTS metrics;"),
6666
call(
6767
sql="CREATE MATERIALIZED VIEW IF NOT EXISTS metrics.view_test_django_qs AS"
68-
+ ' ( SELECT "projects_project"."id", "django_site"."domain" AS "site_domain", COUNT("tasks_task"."id") AS "task_count" FROM "projects_project"'
68+
+ ' ( SELECT "projects_project"."id" AS "id", "django_site"."domain" AS "site_domain", COUNT("tasks_task"."id") AS "task_count" FROM "projects_project"'
6969
+ ' LEFT OUTER JOIN "projects_projectsite" ON ("projects_project"."id" = "projects_projectsite"."project_id")'
7070
+ ' LEFT OUTER JOIN "django_site" ON ("projects_projectsite"."site_id" = "django_site"."id")'
7171
+ ' LEFT OUTER JOIN "tasks_task" ON ("projects_project"."id" = "tasks_task"."project_id")'
72-
+ ' WHERE "projects_project"."deleted" IS NULL GROUP BY "projects_project"."id", 2 ) WITH NO DATA;',
72+
+ ' WHERE "projects_project"."deleted" IS NULL GROUP BY 1, 2 ) WITH NO DATA;',
7373
params=(),
7474
),
7575
call(
@@ -79,6 +79,10 @@ def test_create(self, settings):
7979
sql="CREATE INDEX IF NOT EXISTS task_count_idx ON metrics.view_test_django_qs (task_count);"
8080
),
8181
]
82+
for fn_call, expected_call in zip(
83+
mock_cursor.execute.call_args_list, expected, strict=True
84+
):
85+
assert fn_call == expected_call
8286

8387
def test_create_for_site(self, settings, stub_site):
8488
view = MaterializedView.from_spec(

requirements.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -469,9 +469,9 @@ distlib==0.3.9 \
469469
--hash=sha256:47f8c22fd27c27e25a65601af709b38e4f0a45ea4fc2e710f65755fa8caaaf87 \
470470
--hash=sha256:a60f20dea646b8a33f3e7772f74dc0b2d0772d2837ee1342a00645c81edf9403
471471
# via virtualenv
472-
django==5.1.15 \
473-
--hash=sha256:117871e58d6eda37f09870b7d73a3d66567b03aecd515b386b1751177c413432 \
474-
--hash=sha256:46a356b5ff867bece73fc6365e081f21c569973403ee7e9b9a0316f27d0eb947
472+
django==5.2.13 \
473+
--hash=sha256:5788fce61da23788a8ce6f02583765ab060d396720924789f97fa42119d37f7a \
474+
--hash=sha256:a31589db5188d074c63f0945c3888fad104627dfcc236fb2b97f71f89da33bc4
475475
# via
476476
# django-activity-stream
477477
# django-admin-csvexport
@@ -1628,9 +1628,9 @@ python-dateutil==2.9.0.post0 \
16281628
# freezegun
16291629
# jupyter-client
16301630
# sib-api-v3-sdk
1631-
python-dotenv==1.1.1 \
1632-
--hash=sha256:31f23644fe2602f88ff55e1f5c79ba497e01224ee7737937930c448e4d0e24dc \
1633-
--hash=sha256:a8a6399716257f45be6a007360200409fce5cda2661e3dec71d23dc15f6189ab
1631+
python-dotenv==1.2.2 \
1632+
--hash=sha256:1d8214789a24de455a8b8bd8ae6fe3c6b69a5e3d64aa8a8e5d68e694bbcb285a \
1633+
--hash=sha256:2c371a91fbd7ba082c2c1dc1f8bf89ca22564a087c2c287cd9b662adde799cf3
16341634
python-json-logger==4.0.0 \
16351635
--hash=sha256:af09c9daf6a813aa4cc7180395f50f2a9e5fa056034c9953aec92e381c5ba1e2 \
16361636
--hash=sha256:f58e68eb46e1faed27e0f574a55a0455eecd7b8a5b88b85a784519ba3cff047f

uv.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)