Update pre-commit with newer tools (#724)

.pre-commit-config.yaml

@@ -1,9 +1,41 @@
-# See https://pre-commit.com for more information
+---
-# See https://pre-commit.com/hooks.html for more hooks
+exclude: '^aioesphomeapi/api.*$'
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
+- repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+  rev: v3.2.0
-    hooks:
+  hooks:
-    -   id: trailing-whitespace
+  - id: trailing-whitespace
-    -   id: end-of-file-fixer
+  - id: end-of-file-fixer
-    -   id: check-added-large-files
+  - id: check-added-large-files
+- repo: https://github.com/asottile/pyupgrade
+  rev: v2.37.1
+  hooks:
+  - id: pyupgrade
+    args: [--py37-plus]
+- repo: https://github.com/PyCQA/isort
+  rev: 5.12.0
+  hooks:
+  - id: isort
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.1.1
+  hooks:
+  - id: ruff
+    args:
+    - --fix
+- repo: https://github.com/psf/black-pre-commit-mirror
+  rev: 23.11.0
+  hooks:
+  - id: black
+    args:
+    - --quiet
+    files: ^((aioesphomeapi|tests)/.+)?[^/]+\.py$
+- repo: https://github.com/cdce8p/python-typing-update
+  rev: v0.6.0
+  hooks:
+  - id: python-typing-update
+    stages: [manual]
+    args:
+    - --py39-plus
+    - --force
+    - --keep-updates
+    files: ^(aioesphomeapi)/.+\.py$

aioesphomeapi/_frame_helper/base.py

@@ -42,7 +42,7 @@ class APIFrameHelper:
 
     def __init__(
         self,
-        connection: "APIConnection",
+        connection: APIConnection,
         client_info: str,
         log_name: str,
     ) -> None:

aioesphomeapi/_frame_helper/noise.py

@@ -83,7 +83,7 @@ class APINoiseFrameHelper(APIFrameHelper):
 
     def __init__(
         self,
-        connection: "APIConnection",
+        connection: APIConnection,
         noise_psk: str,
         expected_name: str | None,
         client_info: str,

pyproject.toml

@@ -30,5 +30,10 @@ disable = [
   "too-many-lines",
 ]
 
+[tool.ruff]
+ignore = [
+  "E721", # We want type() check for protobuf messages
+]
+
 [build-system]
 requires = ['setuptools>=65.4.1', 'wheel', 'Cython>=3.0.2']

script/gen-protoc

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 
-from subprocess import check_call
-from pathlib import Path
 import os
+from pathlib import Path
+from subprocess import check_call
 
 root_dir = Path(__file__).absolute().parent.parent
 os.chdir(root_dir)

setup.py

@@ -23,11 +23,11 @@ PROJECT_EMAIL = "esphome@nabucasa.com"
 PROJECT_GITHUB_USERNAME = "esphome"
 PROJECT_GITHUB_REPOSITORY = "aioesphomeapi"
 
-PYPI_URL = "https://pypi.python.org/pypi/{}".format(PROJECT_PACKAGE_NAME)
+PYPI_URL = f"https://pypi.python.org/pypi/{PROJECT_PACKAGE_NAME}"
-GITHUB_PATH = "{}/{}".format(PROJECT_GITHUB_USERNAME, PROJECT_GITHUB_REPOSITORY)
+GITHUB_PATH = f"{PROJECT_GITHUB_USERNAME}/{PROJECT_GITHUB_REPOSITORY}"
-GITHUB_URL = "https://github.com/{}".format(GITHUB_PATH)
+GITHUB_URL = f"https://github.com/{GITHUB_PATH}"
 
-DOWNLOAD_URL = "{}/archive/{}.zip".format(GITHUB_URL, VERSION)
+DOWNLOAD_URL = f"{GITHUB_URL}/archive/{VERSION}.zip"
 
 MODULES_TO_CYTHONIZE = [
     "aioesphomeapi/client_callbacks.py",