chore: pre-commit tweak (#18)

* chore: pre-commit tweak * chore: enable pre-commit hooks * chore: syntax --------- Co-authored-by: Lucas Mindêllo de Andrade <[email protected]>
midea-lan · May 25, 2024 · a2db14a · a2db14a
1 parent 158eb51
commit a2db14a
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 69 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -7,9 +7,11 @@ ARG NODE_VERSION="none"
 RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
 
 # [Optional] If your pip requirements rarely change, uncomment this section to add them to the image.
-# COPY requirements.txt /tmp/pip-tmp/
-# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
-#    && rm -rf /tmp/pip-tmp
+COPY requirements.txt /tmp/pip-tmp/
+RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
+   && rm -rf /tmp/pip-tmp
+
+RUN pip3 --disable-pip-version-check --no-cache-dir install pre-commit
 
 # [Optional] Uncomment this section to install additional OS packages.
 # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -32,5 +32,5 @@
     }
   },
   "remoteUser": "vscode",
-  "postAttachCommand": "pip3 install --user -r requirements.txt"
+  "postAttachCommand": "pre-commit install"
 }
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -34,27 +34,22 @@ repos:
       - id: check-xml
       - id: check-yaml
       - id: detect-private-key
-  - repo: https://github.com/python-poetry/poetry
-    rev: 1.8.0
-    hooks:
-      - id: poetry-check
-        args: ["--lock"]
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v4.0.0-alpha.8
-    hooks:
-      - id: prettier
-        args: ["--tab-width", "2"]
+  # - repo: https://github.com/pre-commit/mirrors-prettier
+  #   rev: v4.0.0-alpha.8
+  #   hooks:
+  #     - id: prettier
+  #       args: ["--tab-width", "2"]
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.15.2
     hooks:
       - id: pyupgrade
         args: [--py37-plus]
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
       - id: codespell
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.0
-    hooks:
-      - id: mypy
-        additional_dependencies: []
+  # - repo: https://github.com/pre-commit/mirrors-mypy
+  #   rev: v1.10.0
+  #   hooks:
+  #     - id: mypy
+  #       additional_dependencies: []
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,25 +1,23 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Install requirements.txt",
-            "type": "shell",
-            "command": "pip3 install --user -r requirements.txt",
-            "problemMatcher": []
-        },
-        {
-            "label": "Build and install midealocal lib",
-            "type": "shell",
-            "command": "rm -rf dist/ && python3 -m build && pip3 install dist/midea_local*.whl",
-            "problemMatcher": []
-        },
-        {
-            "label": "Generate code coverage report",
-            "type": "shell",
-            "command": "python3 -m pytest --rootdir . --cov=midealocal --cov-report term-missing ./tests/",
-            "problemMatcher": []
-        }
-    ]
-}
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Install requirements.txt",
+      "type": "shell",
+      "command": "pip3 install --user -r requirements.txt",
+      "problemMatcher": []
+    },
+    {
+      "label": "Build and install midealocal lib",
+      "type": "shell",
+      "command": "rm -rf dist/ && python3 -m build && pip3 install dist/midea_local*.whl",
+      "problemMatcher": []
+    },
+    {
+      "label": "Generate code coverage report",
+      "type": "shell",
+      "command": "python3 -m pytest --rootdir . --cov=midealocal --cov-report term-missing ./tests/",
+      "problemMatcher": []
+    }
+  ]
+}
diff --git a/README.md b/README.md
@@ -1,18 +1,20 @@
 # Midea-local python lib
+
 [![Python build](https://github.com/rokam/midea-local/actions/workflows/python-build.yml/badge.svg)](https://github.com/rokam/midea-local/actions/workflows/python-build.yml)
 ![Python tests](https://raw.githubusercontent.com/rokam/midea-local/badges/tests.svg)
 [![Python coverage](https://raw.githubusercontent.com/rokam/midea-local/badges/coverage.svg)](https://app.codecov.io/github/rokam/midea-local)
 ![Python fake8](https://raw.githubusercontent.com/rokam/midea-local/badges/flake8.svg)
 
 Control your Midea M-Smart appliances via local area network.
 
-This library is part of https://github.com/georgezhao2010/midea_ac_lan code. It was separated to segregate responsabilities.
+This library is part of https://github.com/georgezhao2010/midea_ac_lan code. It was separated to segregate responsibilities.
 
 ⭐If this component is helpful for you, please star it, it encourages me a lot.
 
 ## Getting started
 
 ### Finding your device
+
 ```python
 from midealocal.discover import discover
 # Without knowing the ip address
@@ -24,6 +26,7 @@ type_code = hex(list(discover().values())[0]['type'])[2:]
 ```
 
 ### Getting data from device
+
 ```python
 from midealocal.discover import discover
 from midealocal.devices import device_selector

diff --git a/library_test.py b/library_test.py
@@ -24,12 +24,12 @@ def get_arguments() -> tuple[ArgumentParser, Namespace]:
         help="Set Cloud username",
     )
     parser.add_argument("--password", "-p", type=str, help="Set Cloud password")
-    parser.add_argument(  
-        "--cloud_name",  
-        "-cn",  
-        type=str,  
-        help="Set Cloud name, options are: " + ", ".join(clouds.keys()),  
-    ) 
+    parser.add_argument(
+        "--cloud_name",
+        "-cn",
+        type=str,
+        help="Set Cloud name, options are: " + ", ".join(clouds.keys()),
+    )
     parser.add_argument(
         "--configfile",
         "-cf",

diff --git a/midealocal/cloud.py b/midealocal/cloud.py
@@ -43,19 +43,19 @@
         "class_name": "MideaAirCloud",
         "app_id": "1117",
         "app_key": "ff0cf6f5f0c3471de36341cab3f7a9af",
-        "api_url": "https://mapp.appsmb.com",
+        "api_url": "https://mapp.appsmb.com",  # codespell:ignore
     },
     "NetHome Plus": {
         "class_name": "MideaAirCloud",
         "app_id": "1017",
         "app_key": "3742e9e5842d4ad59c2db887e12449f9",
-        "api_url": "https://mapp.appsmb.com",
+        "api_url": "https://mapp.appsmb.com",  # codespell:ignore
     },
     "Ariston Clima": {
         "class_name": "MideaAirCloud",
         "app_id": "1005",
         "app_key": "434a209a5ce141c3b726de067835d7f0",
-        "api_url": "https://mapp.appsmb.com",
+        "api_url": "https://mapp.appsmb.com",  # codespell:ignore
     },
 }
 

diff --git a/midealocal/device.py b/midealocal/device.py
@@ -140,7 +140,7 @@ def connect(self, refresh_status=True):
             return True
         except socket.timeout:
             _LOGGER.debug(f"[{self._device_id}] Connection timed out")
-        except socket.error:
+        except OSError:
             _LOGGER.debug(f"[{self._device_id}] Connection error")
         except AuthException:
             _LOGGER.debug(f"[{self._device_id}] Authentication failed")
@@ -203,7 +203,7 @@ def refresh_status(self, wait_response=False):
                         while True:
                             msg = self._socket.recv(512)
                             if len(msg) == 0:
-                                raise socket.error
+                                raise OSError
                             result = self.parse_message(msg)
                             if result == ParseMessageResult.SUCCESS:
                                 break
@@ -300,7 +300,7 @@ def send_command(self, cmd_type, cmd_body: bytearray):
         )
         try:
             self.build_send(cmd)
-        except socket.error as e:
+        except OSError as e:
             _LOGGER.debug(
                 f"[{self._device_id}] Interface send_command failure, {repr(e)}, "
                 f"cmd_type: {cmd_type}, cmd_body: {cmd_body.hex()}"
@@ -374,7 +374,7 @@ def run(self):
                     msg = self._socket.recv(512)
                     msg_len = len(msg)
                     if msg_len == 0:
-                        raise socket.error("Connection closed by peer")
+                        raise OSError("Connection closed by peer")
                     result = self.parse_message(msg)
                     if result == ParseMessageResult.ERROR:
                         _LOGGER.debug(f"[{self._device_id}] Message 'ERROR' received")
@@ -388,7 +388,7 @@ def run(self):
                         _LOGGER.debug(f"[{self._device_id}] Heartbeat timed out")
                         self.close_socket()
                         break
-                except socket.error as e:
+                except OSError as e:
                     if self._is_run:
                         _LOGGER.debug(f"[{self._device_id}] Socket error {repr(e)}")
                         self.close_socket()

diff --git a/midealocal/devices/da/__init__.py b/midealocal/devices/da/__init__.py
@@ -115,7 +115,7 @@ def process_message(self, msg):
         softener = [
             "No",
             "Intelligent",
-            "Programed",
+            "Programed",  # codespell:ignore
             "3",
             "4",
             "5",

diff --git a/midealocal/devices/ed/message.py b/midealocal/devices/ed/message.py
@@ -164,12 +164,10 @@ def __init__(self, body):
             elif attr == 0x011:
                 self.water_consumption = (
                     float(
-                        (
-                            body[data_offset + 3]
-                            + (body[data_offset + 4] << 8)
-                            + (body[data_offset + 5] << 16)
-                            + (body[data_offset + 6] << 24)
-                        )
+                        body[data_offset + 3]
+                        + (body[data_offset + 4] << 8)
+                        + (body[data_offset + 5] << 16)
+                        + (body[data_offset + 6] << 24)
                     )
                     / 1000
                 )

diff --git a/midealocal/discover.py b/midealocal/discover.py
@@ -232,7 +232,7 @@ def discover(discover_type=None, ip_address=None):
                 _LOGGER.debug(f"Found a unsupported device: {device}")
         except socket.timeout:
             break
-        except socket.error as e:
+        except OSError as e:
             _LOGGER.error(f"Socket error: {repr(e)}")
     return found_devices
 
@@ -279,7 +279,7 @@ def get_device_info(device_ip, device_port: int):
             f"Connect the device {device_ip}:{device_port} timed out for 8s. "
             f"Don't care about a small amount of this. if many maybe not support."
         )
-    except socket.error:
+    except OSError:
         _LOGGER.warning(f"Can't connect to Device {device_ip}:{device_port}")
     return response
 

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 import setuptools
 
-with open("README.md", "r", encoding="utf-8") as fh:
+with open("README.md", encoding="utf-8") as fh:
     long_description = fh.read()
 
 requires = ["aiohttp", "ifaddr", "pycryptodome"]