Merge branch 'main' into debug_crash_win32

.github/workflows/ci.yml

@@ -97,8 +97,8 @@ jobs:
       - run: pylint aioesphomeapi
         name: Lint with pylint
         if: ${{ matrix.python-version == '3.12' && matrix.extension == 'skip_cython' && matrix.os == 'ubuntu-latest' }}
-      - run: black --check --diff --color aioesphomeapi tests
+      - run: ruff check aioesphomeapi tests
-        name: Check formatting with black
+        name: Check formatting with ruff
         if: ${{ matrix.python-version == '3.12' && matrix.extension == 'skip_cython' && matrix.os == 'ubuntu-latest' }}
       - run: mypy aioesphomeapi
         name: Check typing with mypy

.pre-commit-config.yaml

@@ -18,14 +18,6 @@ repos:
       - id: ruff
         args: [--fix]
       - id: ruff-format
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.1.1
-    hooks:
-    - id: black
-      args:
-        - --safe
-        - --quiet
-      files: ^((aioesphomeapi|tests)/.+)?[^/]+\.py$
   - repo: https://github.com/cdce8p/python-typing-update
     rev: v0.6.0
     hooks:

requirements_test.txt

@@ -1,5 +1,5 @@
 pylint==3.2.6
-black==24.8.0
+ruff==0.5.4
 flake8==7.1.1
 isort==5.13.2
 mypy==1.11.2

setup.py

@@ -11,7 +11,7 @@ with open(os.path.join(here, "README.rst"), encoding="utf-8") as readme_file:
     long_description = readme_file.read()
 
 
-VERSION = "25.3.0"
+VERSION = "25.3.1"
 PROJECT_NAME = "aioesphomeapi"
 PROJECT_PACKAGE_NAME = "aioesphomeapi"
 PROJECT_LICENSE = "MIT"

tests/test_connection.py

@@ -546,7 +546,9 @@ async def test_plaintext_connection_fails_handshake(
         connect_task = asyncio.create_task(connect(conn, login=False))
         await connected.wait()
 
-    with (pytest.raises(raised_exception),):
+    with (
+        pytest.raises(raised_exception),
+    ):
         await asyncio.sleep(0)
         await connect_task