From f16354fafa5bf23bb909135a316620a2a255399d Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Thu, 29 Aug 2024 11:15:25 -1000 Subject: [PATCH] Bump ruff to 0.6.3 (#936) --- .pre-commit-config.yaml | 2 +- bench/raw_ble_plain_text_with_callback.py | 2 +- requirements_test.txt | 2 +- script/gen-protoc | 24 ++++++++++++++--------- setup.py | 3 ++- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7780a69c3..b3205b981 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,7 +13,7 @@ repos: - id: pyupgrade args: [--py39-plus] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.4 + rev: v0.6.3 hooks: - id: ruff args: [--fix] diff --git a/bench/raw_ble_plain_text_with_callback.py b/bench/raw_ble_plain_text_with_callback.py index 7f85c1f79..2d2e527e4 100644 --- a/bench/raw_ble_plain_text_with_callback.py +++ b/bench/raw_ble_plain_text_with_callback.py @@ -1,5 +1,5 @@ -import timeit from functools import partial +import timeit from aioesphomeapi import APIConnection from aioesphomeapi.api_pb2 import ( diff --git a/requirements_test.txt b/requirements_test.txt index fbb0ad818..5c41e6340 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -1,5 +1,5 @@ pylint==3.2.6 -ruff==0.5.4 +ruff==0.6.3 flake8==7.1.1 isort==5.13.2 mypy==1.11.2 diff --git a/script/gen-protoc b/script/gen-protoc index 013eb37d7..93908a727 100755 --- a/script/gen-protoc +++ b/script/gen-protoc @@ -7,20 +7,26 @@ from subprocess import check_call root_dir = Path(__file__).absolute().parent.parent os.chdir(root_dir) -check_call([ - "protoc", "--python_out=aioesphomeapi", "-I", "aioesphomeapi", - "aioesphomeapi/api.proto", "aioesphomeapi/api_options.proto" -]) +check_call( + [ + "protoc", + "--python_out=aioesphomeapi", + "-I", + "aioesphomeapi", + "aioesphomeapi/api.proto", + "aioesphomeapi/api_options.proto", + ] +) # https://github.com/protocolbuffers/protobuf/issues/1491 -api_file = root_dir / 'aioesphomeapi' / 'api_pb2.py' +api_file = root_dir / "aioesphomeapi" / "api_pb2.py" content = api_file.read_text().replace( "import api_options_pb2 as api__options__pb2", - "from . import api_options_pb2 as api__options__pb2" + "from . import api_options_pb2 as api__options__pb2", ) api_file.write_text(content) -for fname in ['api_pb2.py', 'api_options_pb2.py']: - file = root_dir / 'aioesphomeapi' / fname - content = '# type: ignore\n' + file.read_text() +for fname in ["api_pb2.py", "api_options_pb2.py"]: + file = root_dir / "aioesphomeapi" / fname + content = "# type: ignore\n" + file.read_text() file.write_text(content) diff --git a/setup.py b/setup.py index a600316ce..728a7868e 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 """aioesphomeapi setup script.""" -import os + from distutils.command.build_ext import build_ext +import os from setuptools import find_packages, setup