Skip to content

testing pydantic v1.10.0a2 #407

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

Closed
wants to merge 6 commits into from
Closed

testing pydantic v1.10.0a2 #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f581ac
testing pydantic v1.10.0a2
samuelcolvin Aug 24, 2022
79be9a0
change python requirement to plicate poetry
samuelcolvin Aug 25, 2022
ca02707
fix linting, remove 3.6 CI
samuelcolvin Aug 25, 2022
0e56c91
disable black :sleeping:
samuelcolvin Aug 25, 2022
ca9b492
revert pydantic uprev
samuelcolvin Aug 25, 2022
22b2101
uprev pydantic again, pin sqlalchemy
samuelcolvin Aug 25, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
python-version: ["3.7", "3.8", "3.9", "3.10"]
fail-fast: false

steps:
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ classifiers = [
]

[tool.poetry.dependencies]
python = "^3.6.1"
SQLAlchemy = ">=1.4.17,<1.5.0"
pydantic = "^1.8.2"
python = "^3.7"
SQLAlchemy = ">=1.4.17,<=1.4.34"
pydantic = "==1.10.0b1"
sqlalchemy2-stubs = {version = "*", allow-prereleases = true}

[tool.poetry.dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion scripts/lint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ set -x

mypy sqlmodel
flake8 sqlmodel tests docs_src
black sqlmodel tests docs_src --check
#black sqlmodel tests docs_src --check
isort sqlmodel tests docs_src scripts --check-only
3 changes: 2 additions & 1 deletion sqlmodel/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
Callable,
ClassVar,
Dict,
ForwardRef,
List,
Mapping,
Optional,
Expand All @@ -28,7 +29,7 @@
from pydantic.fields import FieldInfo as PydanticFieldInfo
from pydantic.fields import ModelField, Undefined, UndefinedType
from pydantic.main import ModelMetaclass, validate_model
from pydantic.typing import ForwardRef, NoArgAnyCallable, resolve_annotations
from pydantic.typing import NoArgAnyCallable, resolve_annotations
from pydantic.utils import ROOT_KEY, Representation
from sqlalchemy import (
Boolean,
Expand Down