Skip to content

Commit ea020c2

Browse files
authored
Merge branch 'master' into alert-fix-24
2 parents a98ef30 + e4387f4 commit ea020c2

File tree

13 files changed

+1400
-705
lines changed

13 files changed

+1400
-705
lines changed

.github/dependabot.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,31 @@ updates:
77
interval: daily
88
commit-message:
99
prefix:
10-
# Python
11-
- package-ecosystem: pip
12-
directory: /
10+
# Python uv
11+
- package-ecosystem: uv
12+
directory: /backend
1313
schedule:
1414
interval: daily
1515
commit-message:
1616
prefix:
1717
# npm
1818
- package-ecosystem: npm
19-
directory: /
19+
directory: /frontend
2020
schedule:
2121
interval: daily
2222
commit-message:
2323
prefix:
2424
# Docker
2525
- package-ecosystem: docker
26+
directories:
27+
- /backend
28+
- /frontend
29+
schedule:
30+
interval: weekly
31+
commit-message:
32+
prefix:
33+
# Docker Compose
34+
- package-ecosystem: docker-compose
2635
directory: /
2736
schedule:
2837
interval: weekly

.github/workflows/generate-client.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
with:
2828
python-version: "3.10"
2929
- name: Install uv
30-
uses: astral-sh/setup-uv@v5
30+
uses: astral-sh/setup-uv@v6
3131
with:
3232
version: "0.4.15"
3333
enable-cache: true
@@ -39,7 +39,6 @@ jobs:
3939
- run: uv run bash scripts/generate-client.sh
4040
env:
4141
VIRTUAL_ENV: backend/.venv
42-
ENVIRONMENT: production
4342
SECRET_KEY: just-for-generating-client
4443
POSTGRES_PASSWORD: just-for-generating-client
4544
FIRST_SUPERUSER_PASSWORD: just-for-generating-client

.github/workflows/lint-backend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
python-version: "3.10"
2222
- name: Install uv
23-
uses: astral-sh/setup-uv@v5
23+
uses: astral-sh/setup-uv@v6
2424
with:
2525
version: "0.4.15"
2626
enable-cache: true

.github/workflows/playwright.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
with:
6161
limit-access-to-actor: true
6262
- name: Install uv
63-
uses: astral-sh/setup-uv@v5
63+
uses: astral-sh/setup-uv@v6
6464
with:
6565
version: "0.4.15"
6666
enable-cache: true

.github/workflows/test-backend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
python-version: "3.10"
2222
- name: Install uv
23-
uses: astral-sh/setup-uv@v5
23+
uses: astral-sh/setup-uv@v6
2424
with:
2525
version: "0.4.15"
2626
enable-cache: true

backend/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies = [
1717
"psycopg[binary]<4.0.0,>=3.1.13",
1818
"sqlmodel<1.0.0,>=0.0.21",
1919
# Pin bcrypt until passlib supports the latest
20-
"bcrypt==4.0.1",
20+
"bcrypt==4.3.0",
2121
"pydantic-settings<3.0.0,>=2.2.1",
2222
"sentry-sdk[fastapi]<2.0.0,>=1.40.6",
2323
"pyjwt<3.0.0,>=2.8.0",

backend/uv.lock

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

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22

33
db:
4-
image: postgres:12
4+
image: postgres:17
55
restart: always
66
healthcheck:
77
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]

0 commit comments

Comments
 (0)