Skip to content

Commit 812a4b3

Browse files
committed
perf: Update dependencies, using sqlmodelx
1 parent d730766 commit 812a4b3

6 files changed

Lines changed: 5 additions & 190 deletions

File tree

fastapi_amis_admin/admin/parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
Validation,
1717
)
1818
from fastapi_amis_admin.amis.constants import LabelEnum
19-
from fastapi_amis_admin.models.enums import Choices
19+
from fastapi_amis_admin.models import Choices
2020
from fastapi_amis_admin.utils.pydantic import (
2121
PYDANTIC_V2,
2222
ModelField,
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
from .enums import IntegerChoices, TextChoices
1+
from sqlmodelx import SQLModel
2+
from sqlmodelx.enums import Choices, IntegerChoices, TextChoices
23

3-
try:
4-
from ._sqlmodel import SQLModel
5-
from .fields import Field
6-
7-
# must install sqlmodel to use
8-
except ImportError:
9-
pass
4+
from .fields import Field

fastapi_amis_admin/models/_sqlmodel.py

Lines changed: 0 additions & 64 deletions
This file was deleted.

fastapi_amis_admin/models/enums.py

Lines changed: 0 additions & 77 deletions
This file was deleted.

fastapi_amis_admin/models/sqltypes.py

Lines changed: 0 additions & 34 deletions
This file was deleted.

pyproject.toml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ classifiers = [
3737
]
3838
dependencies = [
3939
"fastapi>=0.103.2",
40-
"pydantic>1.10.0",
41-
"sqlalchemy>=1.4.0",
40+
"sqlmodelx>=0.0.7,<0.1.0",
4241
"python-multipart>=0.0.5",
4342
"sqlalchemy-database>=0.1.1,<0.2.0",
4443
"aiofiles>=0.17.0",
@@ -50,9 +49,6 @@ Documentation = "http://docs.amis.work/"
5049
Source = "https://github.com/amisadmin/fastapi_amis_admin"
5150

5251
[project.optional-dependencies]
53-
sqlmodel = [
54-
"sqlmodel==0.0.14",
55-
]
5652
standard = [
5753
"uvicorn[standard] >=0.19.0,<1.0",
5854
"fastapi-amis-admin-cli>=0.1.3,<0.2.0",
@@ -67,7 +63,6 @@ test = [
6763
"jinja2 >=2.11.2,<4.0.0",
6864
"ujson>=4.0.1",
6965
"requests>=2.28.1",
70-
"sqlmodel==0.0.14",
7166
]
7267
dev = [
7368
"pre-commit>=2.20.0",

0 commit comments

Comments
 (0)