Skip to content

Commit 23bc5c8

Browse files
Merge branch 'master' into chore-refactor-api-routes
2 parents 54c9497 + 9ec0244 commit 23bc5c8

Some content is hidden

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

62 files changed

+7315
-5335
lines changed

.github/dependabot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ updates:
2121
interval: daily
2222
commit-message:
2323
prefix:
24+
ignore:
25+
- dependency-name: "@hey-api/openapi-ts"
2426
# Docker
2527
- package-ecosystem: docker
2628
directories:
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: "Conflict detector"
2+
on:
3+
push:
4+
pull_request_target:
5+
types: [synchronize]
6+
7+
jobs:
8+
main:
9+
permissions:
10+
contents: read
11+
pull-requests: write
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Check if PRs have merge conflicts
15+
uses: eps1lon/actions-label-merge-conflict@v3
16+
with:
17+
dirtyLabel: "conflicts"
18+
repoToken: "${{ secrets.GITHUB_TOKEN }}"
19+
commentOnDirty: "This pull request has a merge conflict that needs to be resolved."

.github/workflows/generate-client.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
with:
2121
ref: ${{ github.head_ref }}
2222
token: ${{ secrets.FULL_STACK_FASTAPI_TEMPLATE_REPO_TOKEN }}
23-
- uses: actions/setup-node@v4
23+
- uses: actions/setup-node@v5
2424
with:
2525
node-version: lts/*
26-
- uses: actions/setup-python@v5
26+
- uses: actions/setup-python@v6
2727
with:
2828
python-version: "3.10"
2929
- name: Install uv

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
pull-requests: write
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/labeler@v5
19+
- uses: actions/labeler@v6
2020
if: ${{ github.event.action != 'labeled' && github.event.action != 'unlabeled' }}
2121
- run: echo "Done adding labels"
2222
# Run this after labeler applied labels

.github/workflows/lint-backend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Checkout
1717
uses: actions/checkout@v5
1818
- name: Set up Python
19-
uses: actions/setup-python@v5
19+
uses: actions/setup-python@v6
2020
with:
2121
python-version: "3.10"
2222
- name: Install uv

.github/workflows/playwright.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ jobs:
4848
fail-fast: false
4949
steps:
5050
- uses: actions/checkout@v5
51-
- uses: actions/setup-node@v4
51+
- uses: actions/setup-node@v5
5252
with:
5353
node-version: lts/*
54-
- uses: actions/setup-python@v5
54+
- uses: actions/setup-python@v6
5555
with:
5656
python-version: '3.10'
5757
- name: Setup tmate session
@@ -94,7 +94,7 @@ jobs:
9494
runs-on: ubuntu-latest
9595
steps:
9696
- uses: actions/checkout@v5
97-
- uses: actions/setup-node@v4
97+
- uses: actions/setup-node@v5
9898
with:
9999
node-version: 20
100100
- name: Install dependencies

.github/workflows/smokeshow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- uses: actions/checkout@v5
18-
- uses: actions/setup-python@v5
18+
- uses: actions/setup-python@v6
1919
with:
2020
python-version: "3.10"
2121
- run: pip install smokeshow

.github/workflows/test-backend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Checkout
1717
uses: actions/checkout@v5
1818
- name: Set up Python
19-
uses: actions/setup-python@v5
19+
uses: actions/setup-python@v6
2020
with:
2121
python-version: "3.10"
2222
- name: Install uv

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ repos:
2828
hooks:
2929
- id: local-biome-check
3030
name: biome check
31-
entry: npx biome check --write --files-ignore-unknown=true --no-errors-on-unmatched
31+
entry: bash -c 'cd frontend && npm run lint'
3232
language: system
3333
types: [text]
34-
files: "\\.(jsx?|tsx?|c(js|ts)|m(js|ts)|d\\.(ts|cts|mts)|jsonc?|css|svelte|vue|astro|graphql|gql)$"
34+
files: ^frontend/
3535

3636
ci:
3737
autofix_commit_msg: 🎨 [pre-commit.ci] Auto format from pre-commit.com hooks

backend/app/core/config.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
computed_field,
1212
model_validator,
1313
)
14-
from pydantic_core import MultiHostUrl
1514
from pydantic_settings import BaseSettings, SettingsConfigDict
1615
from typing_extensions import Self
1716

@@ -60,7 +59,7 @@ def all_cors_origins(self) -> list[str]:
6059
@computed_field # type: ignore[prop-decorator]
6160
@property
6261
def SQLALCHEMY_DATABASE_URI(self) -> PostgresDsn:
63-
return MultiHostUrl.build(
62+
return PostgresDsn.build(
6463
scheme="postgresql+psycopg",
6564
username=self.POSTGRES_USER,
6665
password=self.POSTGRES_PASSWORD,

0 commit comments

Comments
 (0)