Merge branch 'feature/soft_pydantic2' into 'develop'

Changed: soft upgrade to pydantic2

See merge request colorifix/python-notion-api!52

Author: mdelmans

poetry.lock

@@ -13,7 +13,7 @@ authors = [
 [tool.poetry.dependencies]
 python = "^3.11"
 requests = "^2.28.1"
-pydantic = "^1.10.2"
+pydantic = "^2"
 slugify = "^0.0.1"
 PyDrive2 = "^1.15.0"
 openpyxl = "^3.0.10"

pyproject.toml

@@ -3,7 +3,7 @@
 from typing import Any, Dict, Generator, List, Literal, Optional, Type, Union
 
 from loguru import logger
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 from requests.packages.urllib3 import PoolManager
 from requests.packages.urllib3.exceptions import MaxRetryError
 from requests.packages.urllib3.util.retry import Retry

python_notion_api/api.py

@@ -1,6 +1,6 @@
 from typing import List
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from python_notion_api.async_api.iterators import AsyncBlockIterator
 from python_notion_api.async_api.utils import ensure_loaded

python_notion_api/async_api/notion_block.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict, Generator, List, Optional
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from python_notion_api.async_api.notion_page import NotionPage
 from python_notion_api.async_api.utils import ensure_loaded

python_notion_api/async_api/notion_database.py

@@ -1,7 +1,7 @@
 import json
 from typing import Any, Dict, List, Optional, Union
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from python_notion_api.async_api.iterators import (
     AsyncBlockIterator,

python_notion_api/async_api/notion_page.py

@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-from pydantic import BaseModel, Field, PositiveInt
+from pydantic.v1 import BaseModel, Field, PositiveInt
 
 
 class RetryStrategy(BaseModel):

python_notion_api/async_api/retry_strategy.py

@@ -2,7 +2,7 @@
 
 from typing import List, Optional, Union
 
-from pydantic import AnyUrl, BaseModel
+from pydantic.v1 import AnyUrl, BaseModel
 
 from python_notion_api.models.common import (
     EmojiObject,

python_notion_api/models/blocks.py

@@ -3,7 +3,7 @@
 from io import BytesIO
 from typing import Dict, List, Literal, Optional, Union
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 from python_notion_api.gdrive import GDrive
 from python_notion_api.models.fields import idField, typeField

python_notion_api/models/common.py

@@ -1,6 +1,6 @@
 from typing import Dict, List, Optional
 
-from pydantic import BaseModel, Field
+from pydantic.v1 import BaseModel, Field
 
 from python_notion_api.models.common import SelectObject
 from python_notion_api.models.fields import idField, typeField