Skip to content

Feature: 适配 Pydantic V2 并放宽 pytest 限制 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yanyongyu merged 3 commits into from
Mar 9, 2024
Merged

Feature: 适配 Pydantic V2 并放宽 pytest 限制 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86d4e12
:sparkles: 适配 Pydantic V2 并放宽 pytest 限制
he0119 Mar 8, 2024
3c4b6a8
:rotating_light: auto fix by pre-commit hooks
pre-commit-ci[bot] Mar 8, 2024
16bbb19
:heavy_plus_sign: 将 pydantic 添加进 test 依赖
he0119 Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "Default Linux Universal",
"image": "mcr.microsoft.com/devcontainers/universal:2-linux",
"features": {
"ghcr.io/devcontainers-contrib/features/poetry:1": {},
"ghcr.io/devcontainers-contrib/features/poetry:1": {}
},
"postCreateCommand": "poetry config virtualenvs.in-project true && poetry install && poetry run pre-commit install",
"customizations": {
Expand All @@ -13,40 +13,40 @@
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter",
"editor.codeActionsOnSave": {
"source.organizeImports": true,
},
"source.organizeImports": true
}
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"files.exclude": {
"**/__pycache__": true,
"**/__pycache__": true
},
"files.watcherExclude": {
"**/target/**": true,
"**/__pycache__": true,
},
"**/__pycache__": true
}
},
"extensions": [
"ms-python.python",
"ms-python.vscode-pylance",
"ms-python.isort",
"ms-python.black-formatter",
"EditorConfig.EditorConfig",
"esbenp.prettier-vscode",
],
},
},
"esbenp.prettier-vscode"
]
}
}
}
3 changes: 2 additions & 1 deletion nonebug/mixin/call_api/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
)

import pytest
from nonebot.compat import model_dump

from nonebug.base import BaseApp, Context

Expand Down Expand Up @@ -196,7 +197,7 @@ def got_call_send(
model = self.wait_list.get()
if not isinstance(model, Send):
pytest.fail(f"Application got send call but expected {model}")
if model.event.dict() != event.dict():
if model_dump(model.event) != model_dump(event):
pytest.fail(
"Application got send call with "
f"event {event} but expected {model.event}"
Expand Down
Loading