Skip to content

Use pydantic.v1 namespace on all pydantic versions #883

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
merged 4 commits into from
May 1, 2024
Merged

Use pydantic.v1 namespace on all pydantic versions #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94c7452
Use pydantic.v1 namespace on all pydantic versions
rytilahti Apr 29, 2024
1c4f9b4
update lock file
rytilahti Apr 29, 2024
349554e
Update kasa/discover.py
rytilahti May 1, 2024
b55247d
Fix linting
rytilahti May 1, 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
5 changes: 1 addition & 4 deletions kasa/bulb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
from abc import ABC, abstractmethod
from typing import NamedTuple, Optional

try:
from pydantic.v1 import BaseModel
except ImportError:
from pydantic import BaseModel
from pydantic.v1 import BaseModel


class ColorTempRange(NamedTuple):
Expand Down
6 changes: 1 addition & 5 deletions kasa/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from typing import Any, cast

import asyncclick as click
from pydantic.v1 import ValidationError

from kasa import (
AuthenticationError,
Expand Down Expand Up @@ -42,11 +43,6 @@
from kasa.iot.modules import Usage
from kasa.smart import SmartDevice

try:
from pydantic.v1 import ValidationError
except ImportError:
from pydantic import ValidationError

try:
from rich import print as _do_echo
except ImportError:
Expand Down
6 changes: 1 addition & 5 deletions kasa/discover.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@
# When support for cpython older than 3.11 is dropped
# async_timeout can be replaced with asyncio.timeout
from async_timeout import timeout as asyncio_timeout

try:
from pydantic.v1 import BaseModel, ValidationError # pragma: no cover
except ImportError:
from pydantic import BaseModel, ValidationError # pragma: no cover
from pydantic.v1 import BaseModel, ValidationError

from kasa import Device
from kasa.credentials import Credentials
Expand Down
5 changes: 1 addition & 4 deletions kasa/iot/iotbulb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
from enum import Enum
from typing import Optional, cast

try:
from pydantic.v1 import BaseModel, Field, root_validator
except ImportError:
from pydantic import BaseModel, Field, root_validator
from pydantic.v1 import BaseModel, Field, root_validator

from ..bulb import HSV, Bulb, BulbPreset, ColorTempRange
from ..device_type import DeviceType
Expand Down
5 changes: 1 addition & 4 deletions kasa/iot/modules/cloud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
"""Cloud module implementation."""

try:
from pydantic.v1 import BaseModel
except ImportError:
from pydantic import BaseModel
from pydantic.v1 import BaseModel

from ...feature import Feature
from ..iotmodule import IotModule
Expand Down
6 changes: 1 addition & 5 deletions kasa/iot/modules/rulemodule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@
from enum import Enum
from typing import Dict, List, Optional

try:
from pydantic.v1 import BaseModel
except ImportError:
from pydantic import BaseModel

from pydantic.v1 import BaseModel

from ..iotmodule import IotModule, merge

Expand Down
9 changes: 3 additions & 6 deletions kasa/smart/modules/firmware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,15 @@

from __future__ import annotations

from datetime import date
from typing import TYPE_CHECKING, Any, Optional

from pydantic.v1 import BaseModel, Field, validator

from ...exceptions import SmartErrorCode
from ...feature import Feature
from ..smartmodule import SmartModule

try:
from pydantic.v1 import BaseModel, Field, validator
except ImportError:
from pydantic import BaseModel, Field, validator
from datetime import date

if TYPE_CHECKING:
from ..smartdevice import SmartDevice

Expand Down
493 changes: 242 additions & 251 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ kasa = "kasa.cli:cli"
python = "^3.8"
anyio = "*" # see https://github.com/python-trio/asyncclick/issues/18
asyncclick = ">=8"
pydantic = ">=1"
pydantic = ">=1.10.15"
cryptography = ">=1.9"
async-timeout = ">=3.0.0"
aiohttp = ">=3"
Expand Down