Skip to content

Commit 2f8b894

Browse files
authored
Merge branch 'main' into ami/pydantic-jsonb
2 parents f52c558 + 816f290 commit 2f8b894

8 files changed

Lines changed: 112 additions & 73 deletions

File tree

.github/workflows/add-to-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Add to project
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
15+
- uses: actions/add-to-project@5afcf98fcd03f1c2f92c3c83f58ae24323cc57fd # v2.0.0
1616
with:
1717
project-url: https://github.com/orgs/fastapi/projects/2
1818
github-token: ${{ secrets.PROJECTS_TOKEN }}

.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@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
19+
- uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0
2020
if: ${{ github.event.action != 'labeled' && github.event.action != 'unlabeled' }}
2121
- run: echo "Done adding labels"
2222
# Run this after labeler applied labels

.pre-commit-config.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ repos:
1212
- id: end-of-file-fixer
1313
- id: trailing-whitespace
1414

15+
- repo: https://github.com/crate-ci/typos
16+
rev: bbaefadf97b0ec5fdc942684b647f1a6ab250274 # v1.46.0
17+
hooks:
18+
- id: typos
19+
args: [--force-exclude]
20+
1521
- repo: local
1622
hooks:
1723
- id: local-ruff-check

docs/release-notes.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@
44

55
### Internal
66

7+
* ⬆ Bump ty from 0.0.34 to 0.0.35. PR [#1904](https://github.com/fastapi/sqlmodel/pull/1904) by [@dependabot[bot]](https://github.com/apps/dependabot).
8+
* ⬆ Bump actions/add-to-project from 1.0.2 to 2.0.0. PR [#1900](https://github.com/fastapi/sqlmodel/pull/1900) by [@dependabot[bot]](https://github.com/apps/dependabot).
9+
* ⬆ Bump actions/labeler from 6.0.1 to 6.1.0. PR [#1902](https://github.com/fastapi/sqlmodel/pull/1902) by [@dependabot[bot]](https://github.com/apps/dependabot).
10+
* ⬆ Bump pydantic-settings from 2.14.0 to 2.14.1. PR [#1903](https://github.com/fastapi/sqlmodel/pull/1903) by [@dependabot[bot]](https://github.com/apps/dependabot).
11+
* ⬆ Bump prek from 0.3.11 to 0.3.13. PR [#1901](https://github.com/fastapi/sqlmodel/pull/1901) by [@dependabot[bot]](https://github.com/apps/dependabot).
12+
* 👷 Add pre-commit for typos. PR [#1899](https://github.com/fastapi/sqlmodel/pull/1899) by [@tiangolo](https://github.com/tiangolo).
13+
* ⬆ Bump ty from 0.0.32 to 0.0.34. PR [#1898](https://github.com/fastapi/sqlmodel/pull/1898) by [@dependabot[bot]](https://github.com/apps/dependabot).
14+
* ⬆ Bump typer from 0.25.0 to 0.25.1. PR [#1896](https://github.com/fastapi/sqlmodel/pull/1896) by [@dependabot[bot]](https://github.com/apps/dependabot).
15+
* ⬆ Bump prek from 0.3.10 to 0.3.11. PR [#1892](https://github.com/fastapi/sqlmodel/pull/1892) by [@dependabot[bot]](https://github.com/apps/dependabot).
16+
* ⬆ Bump typer from 0.24.2 to 0.25.0. PR [#1893](https://github.com/fastapi/sqlmodel/pull/1893) by [@dependabot[bot]](https://github.com/apps/dependabot).
17+
* ⬆ Bump ruff from 0.15.11 to 0.15.12. PR [#1888](https://github.com/fastapi/sqlmodel/pull/1888) by [@dependabot[bot]](https://github.com/apps/dependabot).
18+
* ⬆ Bump fastapi from 0.136.0 to 0.136.1. PR [#1887](https://github.com/fastapi/sqlmodel/pull/1887) by [@dependabot[bot]](https://github.com/apps/dependabot).
19+
* ⬆ Bump typer from 0.24.1 to 0.24.2. PR [#1883](https://github.com/fastapi/sqlmodel/pull/1883) by [@dependabot[bot]](https://github.com/apps/dependabot).
720
* ⬆ Bump prek from 0.3.9 to 0.3.10. PR [#1881](https://github.com/fastapi/sqlmodel/pull/1881) by [@dependabot[bot]](https://github.com/apps/dependabot).
821
* ⬆ Bump ty from 0.0.31 to 0.0.32. PR [#1876](https://github.com/fastapi/sqlmodel/pull/1876) by [@dependabot[bot]](https://github.com/apps/dependabot).
922
* ⬆ Bump pydantic-settings from 2.13.1 to 2.14.0. PR [#1878](https://github.com/fastapi/sqlmodel/pull/1878) by [@dependabot[bot]](https://github.com/apps/dependabot).

docs_src/tutorial/insert/annotations/en/tutorial003.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
3. Use a `with` block to create a `Session` using the `engine`.
88

9-
The new **sesion** will be assigned to the variable `session`.
9+
The new **session** will be assigned to the variable `session`.
1010

1111
And it will be automatically closed when the `with` block is finished.
1212

pyproject.toml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,22 @@ keep-runtime-typing = true
154154

155155
[tool.ty.terminal]
156156
error-on-warning = true
157+
158+
[tool.typos.files]
159+
extend-exclude = [
160+
"coverage/",
161+
"dist/",
162+
"docs/img/",
163+
"docs/release-notes.md",
164+
"htmlcov/",
165+
"site/",
166+
"site_build/",
167+
"uv.lock",
168+
]
169+
170+
[tool.typos.default.extend-identifiers]
171+
alls = "alls"
172+
173+
[tool.typos.default.extend-words]
174+
Ines = "Ines"
175+
selectin = "selectin"

sqlmodel/sql/_expression_select_cls.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ def where(self, *whereclause: _ColumnExpressionArgument[bool] | bool) -> Self:
2020
"""Return a new `Select` construct with the given expression added to
2121
its `WHERE` clause, joined to the existing clause via `AND`, if any.
2222
"""
23-
return super().where(*whereclause)
23+
return super().where(*whereclause) # ty: ignore[invalid-argument-type]
2424

2525
def having(self, *having: _ColumnExpressionArgument[bool] | bool) -> Self:
2626
"""Return a new `Select` construct with the given expression added to
2727
its `HAVING` clause, joined to the existing clause via `AND`, if any.
2828
"""
29-
return super().having(*having)
29+
return super().having(*having) # ty: ignore[invalid-argument-type]
3030

3131

3232
class Select(SelectBase[_T]):

0 commit comments

Comments
 (0)