update pydantic v2

Signed-off-by: ふぁ <[email protected]>

Author: fa0311

twitter_openapi_python/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "twitter_openapi_python"
-version = "0.0.12"
+version = "0.0.13"
 description = "Twitter OpenAPI"
 authors = ["fa0311 <[email protected]>"]
 license = "proprietary" # or "AGPL-3.0-only"
@@ -12,7 +12,7 @@ include = ["twitter_openapi_python/py.typed"]
 
 [tool.poetry.dependencies]
 python = "^3.7"
-pydantic = "^1.10.5, <2"
+pydantic = ">=2.6"
 
 twitter-openapi-python-generated = "0.0.7"
 

twitter_openapi_python/requirements.txt

@@ -7,7 +7,7 @@
 PYTHON_REQUIRES = ">=3.7"
 REQUIRES = [
     "twitter_openapi_python_generated == 0.0.6",
-    "pydantic >= 1.10.5, < 2",
+    "pydantic >= 2.6",
 ]
 
 setup(

twitter_openapi_python/setup.py

@@ -3,7 +3,7 @@
 # flake8: noqa
 
 
-from twitter_openapi_python.models.base import BaseModel, GenericModel
+from twitter_openapi_python.models.base import BaseModel
 from twitter_openapi_python.models.header import ApiUtilsHeader
 from twitter_openapi_python.models.initial_state import (
     InitialStateApiUtilsRaw,

twitter_openapi_python/twitter_openapi_python/models/__init__.py

@@ -1,12 +1,9 @@
-from pydantic import BaseModel as PydanticBaseModel
-from pydantic.generics import GenericModel as PydanticGenericModel
+from typing import TypeVar
 
+from pydantic import BaseModel as PydanticBaseModel
 
-class BaseModel(PydanticBaseModel):
-    class Config:
-        arbitrary_types_allowed = True
+T = TypeVar("T")
 
 
-class GenericModel(PydanticGenericModel):
-    class Config:
-        arbitrary_types_allowed = True
+class BaseModel(PydanticBaseModel):
+    model_config = {"arbitrary_types_allowed": True}

twitter_openapi_python/twitter_openapi_python/models/base.py

@@ -3,7 +3,7 @@
 import twitter_openapi_python_generated as twitter
 from pydantic import Field
 
-from twitter_openapi_python.models import ApiUtilsHeader, BaseModel, GenericModel
+from twitter_openapi_python.models import ApiUtilsHeader, BaseModel
 
 T1 = TypeVar("T1")
 T2 = TypeVar("T2")
@@ -13,7 +13,7 @@ class TwitterApiUtilsRaw(BaseModel):
     response: twitter.ApiResponse = Field()
 
 
-class TwitterApiUtilsResponse(GenericModel, Generic[T1]):
+class TwitterApiUtilsResponse(BaseModel, Generic[T1]):
     raw: TwitterApiUtilsRaw = Field()
     data: T1 = Field()
     header: ApiUtilsHeader = Field()

twitter_openapi_python/twitter_openapi_python/models/response.py

@@ -4,7 +4,7 @@
 import twitter_openapi_python_generated.models as models
 from pydantic import Field
 
-from twitter_openapi_python.models import BaseModel, GenericModel
+from twitter_openapi_python.models import BaseModel
 
 T = TypeVar("T")
 
@@ -34,7 +34,7 @@ class UserApiUtilsData(BaseModel):
     user: models.User = Field()
 
 
-class TimelineApiUtilsResponse(GenericModel, Generic[T]):
+class TimelineApiUtilsResponse(BaseModel, Generic[T]):
     raw: ApiUtilsRaw = Field()
     cursor: CursorApiUtilsResponse = Field()
     data: List[T] = Field(default_factory=list)