From 746067eb2acda078c4ff6d7bd6a1ba912484117b Mon Sep 17 00:00:00 2001
From: Joost Lekkerkerker <joostlek@outlook.com>
Date: Wed, 21 Feb 2024 17:48:54 +0100
Subject: [PATCH] Fix UP007 (#243)

---
 .pre-commit-config.yaml |  6 ------
 pyproject.toml          |  1 -
 roombapy/discovery.py   |  3 +--
 roombapy/roomba_info.py | 15 ++++++++++-----
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e024a3f..a064703 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -85,12 +85,6 @@ repos:
         types: [text]
         entry: poetry run end-of-file-fixer
         stages: [commit, push, manual]
-      - id: mypy
-        name: 🆎 Static type checking using mypy
-        language: system
-        types: [python]
-        entry: poetry run mypy
-        require_serial: true
       - id: no-commit-to-branch
         name: 🛑 Don't commit to main branch
         language: system
diff --git a/pyproject.toml b/pyproject.toml
index 8000b8b..33f3ea2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -82,7 +82,6 @@ ignore = [
     "SIM102",
     "SLF001",
     "T201",
-    "UP007",
 ]
 select = ["ALL"]
 
diff --git a/roombapy/discovery.py b/roombapy/discovery.py
index 2cb7502..fd375b3 100644
--- a/roombapy/discovery.py
+++ b/roombapy/discovery.py
@@ -2,7 +2,6 @@
 
 import logging
 import socket
-from typing import Optional
 
 from pydantic import ValidationError
 
@@ -81,7 +80,7 @@ def _start_server(self):
         self.log.debug("Socket server started, port %s", self.udp_port)
 
 
-def _decode_data(raw_response: bytes) -> Optional[RoombaInfo]:
+def _decode_data(raw_response: bytes) -> RoombaInfo | None:
     try:
         data = raw_response.decode()
     except UnicodeDecodeError:
diff --git a/roombapy/roomba_info.py b/roombapy/roomba_info.py
index f173f1a..27314df 100644
--- a/roombapy/roomba_info.py
+++ b/roombapy/roomba_info.py
@@ -1,13 +1,18 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import Optional
 
 try:
-    from pydantic.v1 import BaseModel, Field, field_validator
+    from pydantic.v1 import (  # type: ignore[attr-defined]
+        BaseModel,
+        Field,
+        field_validator,
+    )
 except ImportError:
-    from pydantic import BaseModel, Field
-    from pydantic import validator as field_validator
+    from pydantic import BaseModel, Field  # type: ignore[attr-defined]
+    from pydantic import (
+        validator as field_validator,  # type: ignore[attr-defined]
+    )
 
 
 class RoombaInfo(BaseModel):
@@ -18,7 +23,7 @@ class RoombaInfo(BaseModel):
     robot_name: str = Field(alias="robotname")
     sku: str
     capabilities: dict[str, int] = Field(alias="cap")
-    password: Optional[str] = None
+    password: str | None = None
 
     @field_validator("hostname")
     @classmethod