Support pydantic v2 using v1 shims (#1816)

miio/cloud.py

@@ -3,7 +3,11 @@
 from typing import TYPE_CHECKING, Dict, Optional
 
 import click
-from pydantic import BaseModel, Field
+
+try:
+    from pydantic.v1 import BaseModel, Field
+except ImportError:
+    from pydantic import BaseModel, Field
 
 try:
     from rich import print as echo

miio/devtools/simulators/miiosimulator.py

@@ -5,7 +5,11 @@
 from typing import List, Optional, Union
 
 import click
-from pydantic import BaseModel, Field, PrivateAttr
+
+try:
+    from pydantic.v1 import BaseModel, Field, PrivateAttr
+except ImportError:
+    from pydantic import BaseModel, Field, PrivateAttr
 from yaml import safe_load
 
 from miio import PushServer

miio/devtools/simulators/miotsimulator.py

@@ -6,8 +6,11 @@
 from typing import List, Union
 
 import click
-from pydantic import Field, validator
 
+try:
+    from pydantic.v1 import Field, validator
+except ImportError:
+    from pydantic import Field, validator
 from miio import PushServer
 from miio.miot_cloud import MiotCloud
 from miio.miot_models import DeviceModel, MiotAccess, MiotProperty, MiotService

miio/miot_cloud.py

@@ -8,7 +8,11 @@
 
 import appdirs
 from micloud.miotspec import MiotSpec
-from pydantic import BaseModel, Field
+
+try:
+    from pydantic.v1 import BaseModel, Field
+except ImportError:
+    from pydantic import BaseModel, Field
 
 from miio import CloudException
 from miio.miot_models import DeviceModel

miio/miot_models.py

@@ -3,7 +3,10 @@
 from enum import Enum
 from typing import Any, Dict, List, Optional
 
-from pydantic import BaseModel, Field, PrivateAttr, root_validator
+try:
+    from pydantic.v1 import BaseModel, Field, PrivateAttr, root_validator
+except ImportError:
+    from pydantic import BaseModel, Field, PrivateAttr, root_validator
 
 from .descriptors import (
     AccessFlags,

miio/tests/test_miot_models.py

@@ -4,7 +4,11 @@
 from pathlib import Path
 
 import pytest
-from pydantic import BaseModel
+
+try:
+    from pydantic.v1 import BaseModel
+except ImportError:
+    from pydantic import BaseModel
 
 from miio.descriptors import (
     AccessFlags,

pyproject.toml

@@ -39,7 +39,7 @@ tqdm = "^4"
 micloud = { version = ">=0.6" }
 croniter = ">=1"
 defusedxml = "^0"
-pydantic = "^1"
+pydantic = ">=1,<3"
 PyYAML = ">=5,<7"
 
 # doc dependencies