Try to use pydantic v2, and fallback to pydantic v1 (#773)

pull/807/head
Stanislav Zhuk 9 months ago committed by GitHub
parent f23b0a0258
commit d2d0fa8a06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -25,7 +25,11 @@ from typing import Tuple, Iterable, Union, List, Dict, Optional, Hashable, NewTy
from evdev import ecodes
from inputremapper.input_event import InputEvent
from pydantic import BaseModel, root_validator, validator
try:
from pydantic.v1 import BaseModel, root_validator, validator
except ImportError:
from pydantic import BaseModel, root_validator, validator
from inputremapper.configs.system_mapping import system_mapping
from inputremapper.gui.messages.message_types import MessageType

@ -33,18 +33,33 @@ from evdev.ecodes import (
REL_HWHEEL_HI_RES,
REL_WHEEL_HI_RES,
)
from pydantic import (
BaseModel,
PositiveInt,
confloat,
conint,
root_validator,
validator,
ValidationError,
PositiveFloat,
VERSION,
BaseConfig,
)
try:
from pydantic.v1 import (
BaseModel,
PositiveInt,
confloat,
conint,
root_validator,
validator,
ValidationError,
PositiveFloat,
VERSION,
BaseConfig,
)
except ImportError:
from pydantic import (
BaseModel,
PositiveInt,
confloat,
conint,
root_validator,
validator,
ValidationError,
PositiveFloat,
VERSION,
BaseConfig,
)
from inputremapper.configs.input_config import InputCombination
from inputremapper.configs.system_mapping import system_mapping, DISABLE_NAME

@ -36,7 +36,10 @@ from typing import (
overload,
)
from pydantic import ValidationError
try:
from pydantic.v1 import ValidationError
except ImportError:
from pydantic import ValidationError
from inputremapper.configs.input_config import InputCombination, InputConfig
from inputremapper.configs.mapping import Mapping, UIMapping

@ -18,7 +18,10 @@
# You should have received a copy of the GNU General Public License
# along with input-remapper. If not, see <https://www.gnu.org/licenses/>.
from pydantic import ValidationError
try:
from pydantic.v1 import ValidationError
except ImportError:
from pydantic import ValidationError
from inputremapper.input_event import InputEvent
from tests.lib.global_uinputs import (

@ -30,7 +30,11 @@ from evdev.ecodes import (
REL_WHEEL_HI_RES,
KEY_1,
)
from pydantic import ValidationError
try:
from pydantic.v1 import ValidationError
except ImportError:
from pydantic import ValidationError
from inputremapper.configs.mapping import Mapping, UIMapping
from inputremapper.configs.system_mapping import system_mapping, DISABLE_NAME

Loading…
Cancel
Save