Skip to content

Commit d381d46

Browse files
authored
Merge branch 'main' into docs-fastapi-lifespan-v2
2 parents 4042d09 + 401aab9 commit d381d46

File tree

25 files changed

+937
-1381
lines changed

25 files changed

+937
-1381
lines changed

.github/workflows/test.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,19 @@ jobs:
2727
matrix:
2828
os: [ ubuntu-latest, windows-latest, macos-latest ]
2929
python-version: [ "3.14" ]
30-
pydantic-version:
31-
- pydantic-v2
3230
include:
3331
- os: windows-latest
3432
python-version: "3.9"
35-
pydantic-version: pydantic-v2
3633
- os: ubuntu-latest
3734
python-version: "3.10"
38-
pydantic-version: pydantic-v1
3935
- os: macos-latest
4036
python-version: "3.11"
41-
pydantic-version: pydantic-v2
4237
- os: windows-latest
4338
python-version: "3.12"
44-
pydantic-version: pydantic-v1
4539
- os: ubuntu-latest
4640
python-version: "3.13"
47-
pydantic-version: pydantic-v1
4841
- os: macos-latest
4942
python-version: "3.13"
50-
pydantic-version: pydantic-v2
5143
fail-fast: false
5244
runs-on: ${{ matrix.os }}
5345
steps:
@@ -72,12 +64,6 @@ jobs:
7264
limit-access-to-actor: true
7365
- name: Install Dependencies
7466
run: uv pip install -r requirements-tests.txt
75-
- name: Install Pydantic v1
76-
if: matrix.pydantic-version == 'pydantic-v1'
77-
run: uv pip install --upgrade "pydantic>=1.10.0,<2.0.0"
78-
- name: Install Pydantic v2
79-
if: matrix.pydantic-version == 'pydantic-v2'
80-
run: uv pip install --upgrade "pydantic>=2.0.2,<3.0.0"
8167
- run: mkdir coverage
8268
- name: Test
8369
run: bash scripts/test.sh

docs/release-notes.md

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

55
### Internal
66

7+
* ✅ Update tests, remove conditionals for Pydantic v1. PR [#1702](https://github.com/fastapi/sqlmodel/pull/1702) by [@tiangolo](https://github.com/tiangolo).
8+
9+
## 0.0.31
10+
11+
### Breaking Changes
12+
13+
* ➖ Drop support for Pydantic v1. PR [#1701](https://github.com/fastapi/sqlmodel/pull/1701) by [@tiangolo](https://github.com/tiangolo).
14+
15+
### Internal
16+
717
* ⬆ Bump dirty-equals from 0.9.0 to 0.11. PR [#1649](https://github.com/fastapi/sqlmodel/pull/1649) by [@dependabot[bot]](https://github.com/apps/dependabot).
818
* ⬆ Bump mkdocs-material from 9.7.0 to 9.7.1. PR [#1690](https://github.com/fastapi/sqlmodel/pull/1690) by [@dependabot[bot]](https://github.com/apps/dependabot).
919
* ⬆ Bump typer from 0.20.1 to 0.21.0. PR [#1694](https://github.com/fastapi/sqlmodel/pull/1694) by [@dependabot[bot]](https://github.com/apps/dependabot).

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ classifiers = [
3737

3838
dependencies = [
3939
"SQLAlchemy >=2.0.14,<2.1.0",
40-
"pydantic >=1.10.13,<3.0.0",
40+
"pydantic>=2.7.0",
4141
]
4242

4343
[project.urls]

sqlmodel/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "0.0.30"
1+
__version__ = "0.0.31"
22

33
# Re-export from SQLAlchemy
44
from sqlalchemy.engine import create_engine as create_engine

0 commit comments

Comments
 (0)