Skip to content

Commit e7967bc

Browse files
committed
Merge branch 'develop' into backend/feature/get-dashboard-v2
2 parents d582db7 + ee37bd2 commit e7967bc

388 files changed

Lines changed: 13921 additions & 6191 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
"editor.tabSize": 2,
5656
"editor.insertSpaces": true,
5757
"files.trimTrailingWhitespace": true,
58-
"eslint.useFlatConfig": false,
5958
"python-env.workspaceSearchPaths": [ "app/backend/.venv" ],
6059
"python.testing.cwd": "app/backend/src/tests",
6160
"python.testing.unittestEnabled": false,

app/backend/.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
!templates
1010
!alembic.ini
1111
!pyproject.toml
12+
!feature-flags.dev.json
1213

1314
# It's not included into the final image, but is still needed here
1415
# for "--mount=type=bind"

app/backend/feature-flags.dev.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
2-
"test_growthbook_integration": true,
3-
"sms_enabled": false,
4-
"strong_verification_enabled": false,
5-
"log_native_ota_requests": true,
6-
"donations_enabled": false,
72
"antibot_enabled": false,
8-
"postal_verification_enabled": false,
3+
"donations_enabled": false,
4+
"email_ics_attachments_enabled": true,
95
"listmonk_enabled": false,
6+
"log_native_ota_requests": true,
107
"notification_translations_enabled": true,
11-
"email_ics_attachments_enabled": true
8+
"postal_verification_enabled": false,
9+
"public_trips_enabled": true,
10+
"sms_enabled": false,
11+
"strong_verification_enabled": false,
12+
"test_growthbook_integration": true
1213
}

app/backend/proto/internal/jobs.proto

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@ message GenerateEventCreateNotificationsPayload {
8080
message GenerateEventUpdateNotificationsPayload {
8181
int64 updating_user_id = 1;
8282
int64 occurrence_id = 2;
83-
repeated string updated_items = 3;
83+
// TODO(#9117): Remove once unused. Was not i18n-friendly. Use updated_enum_items.
84+
repeated string updated_str_items = 3 [deprecated = true];
85+
// EventUpdateItem is from the shared protos and cannot be referenced here.
86+
// int32 has the same on-wire encoding.
87+
repeated int32 updated_enum_items = 4;
8488
}
8589

8690
message GenerateEventCancelNotificationsPayload {

app/backend/pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
description = "Couchers.org backend application"
55
requires-python = "==3.14.*"
66
dependencies = [
7-
"alembic>=1.17.1",
7+
"alembic>=1.18.5",
88
"babel>=2.18.0",
99
"boto3>=1.43.1",
1010
"cachetools>=6.2.1",
@@ -35,9 +35,9 @@ dependencies = [
3535
"pyyaml>=6.0.3",
3636
"regex>=2024.0.0",
3737
"requests>=2.34.2",
38-
"sentry-sdk>=2.43.0",
38+
"sentry-sdk>=2.65.0",
3939
"Shapely>=2.1.1",
40-
"sqlalchemy>=2.0.43",
40+
"sqlalchemy>=2.0.51",
4141
"sqlalchemy-utils>=0.42.0",
4242
"stripe>=13.1.0",
4343
"ua-parser>=1.0.2",
@@ -51,7 +51,7 @@ dump-emails = "couchers.email.dump_emails:main"
5151

5252
[dependency-groups]
5353
dev = [
54-
"ruff>=0.14.3",
54+
"ruff>=0.15.20",
5555
"pytest>=8.4.2",
5656
"pytest-cov>=6.2.1",
5757
"pre-commit>=4.2.0",
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[
2+
{
3+
"alpha3": "_tw",
4+
"name": "Taiwanese"
5+
}
6+
]

0 commit comments

Comments
 (0)