Skip to content

Commit e9a72c6

Browse files
authored
Merge branch 'main' into dependabot/uv/python-packages-fa30b79da8
2 parents 8be17aa + 923f9f4 commit e9a72c6

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

.github/workflows/detect-conflicts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
timeout-minutes: 5
1616
steps:
1717
- name: Check if PRs have merge conflicts
18-
uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
18+
uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0
1919
with:
2020
dirtyLabel: "conflicts"
2121
repoToken: "${{ secrets.GITHUB_TOKEN }}"

docs/release-notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
### Internal
1515

16+
* ⬆️ Bump Pydantic to 2.13.4. PR [#1985](https://github.com/fastapi/sqlmodel/pull/1985) by [@YuriiMotov](https://github.com/YuriiMotov).
1617
* 👷 Automate release preparation. PR [#1988](https://github.com/fastapi/sqlmodel/pull/1988) by [@tiangolo](https://github.com/tiangolo).
1718
* 🔥 Remove old package stub slim, not used nor needed. PR [#1987](https://github.com/fastapi/sqlmodel/pull/1987) by [@tiangolo](https://github.com/tiangolo).
1819
* ⬆ Bump the github-actions group with 2 updates. PR [#1983](https://github.com/fastapi/sqlmodel/pull/1983) by [@dependabot[bot]](https://github.com/apps/dependabot).

0 commit comments

Comments
 (0)