From 2c3576fbd4d8a539d0c4f400caa28e23954a42d6 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 23 Jul 2024 10:27:08 +0200 Subject: [PATCH] Removed reorder-python-imports, it conflicts with black, see https://github.com/psf/black/issues/4175 * .github/workflows/constraints.txt: * .github/workflows/tests.yaml: * .pre-commit-config.yaml: * custom_components/myenergi/__init__.py: * custom_components/myenergi/binary_sensor.py: * custom_components/myenergi/config_flow.py: * custom_components/myenergi/const.py: * custom_components/myenergi/diagnostics.py: * custom_components/myenergi/entity.py: * custom_components/myenergi/number.py: * custom_components/myenergi/select.py: * custom_components/myenergi/sensor.py: * requirements_dev.txt: * tests/__init__.py: * tests/conftest.py: * tests/const.py: * tests/test_config_flow.py: * tests/test_init.py: * tests/test_number.py: * tests/test_select.py: * tests/test_sensor.py: * tests/test_services.py: --- .github/workflows/constraints.txt | 1 - .github/workflows/tests.yaml | 2 +- .pre-commit-config.yaml | 6 ------ custom_components/myenergi/__init__.py | 1 + custom_components/myenergi/binary_sensor.py | 1 + custom_components/myenergi/config_flow.py | 1 + custom_components/myenergi/const.py | 1 + custom_components/myenergi/diagnostics.py | 1 + custom_components/myenergi/entity.py | 1 + custom_components/myenergi/number.py | 1 + custom_components/myenergi/select.py | 1 + custom_components/myenergi/sensor.py | 1 + requirements_dev.txt | 1 - tests/__init__.py | 1 + tests/conftest.py | 1 + tests/const.py | 1 + tests/test_config_flow.py | 1 + tests/test_init.py | 1 + tests/test_number.py | 1 + tests/test_select.py | 1 + tests/test_sensor.py | 1 + tests/test_services.py | 1 + 22 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.github/workflows/constraints.txt b/.github/workflows/constraints.txt index b423833..0450d2c 100644 --- a/.github/workflows/constraints.txt +++ b/.github/workflows/constraints.txt @@ -2,4 +2,3 @@ pip==24.0 pre-commit==3.6.2 black==24.2.0 flake8==7.0.0 -reorder-python-imports==3.12.0 diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 54d271f..37575a4 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -34,7 +34,7 @@ jobs: - name: Install Python modules run: | - pip install --constraint=.github/workflows/constraints.txt pre-commit black flake8 reorder-python-imports + pip install --constraint=.github/workflows/constraints.txt pre-commit black flake8 - name: Run pre-commit on all files run: | diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9e56033..1bda09c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,12 +20,6 @@ repos: language: system types: [python] require_serial: true - - id: reorder-python-imports - name: Reorder python imports - entry: reorder-python-imports - language: system - types: [python] - args: [--application-directories=custom_components] - repo: https://github.com/pre-commit/mirrors-prettier rev: v3.1.0 hooks: diff --git a/custom_components/myenergi/__init__.py b/custom_components/myenergi/__init__.py index eb15d0a..f045e4c 100644 --- a/custom_components/myenergi/__init__.py +++ b/custom_components/myenergi/__init__.py @@ -4,6 +4,7 @@ For more details about this integration, please refer to https://github.com/cjne/myenergi """ + import asyncio import logging from datetime import timedelta diff --git a/custom_components/myenergi/binary_sensor.py b/custom_components/myenergi/binary_sensor.py index d3740cf..3477dc7 100644 --- a/custom_components/myenergi/binary_sensor.py +++ b/custom_components/myenergi/binary_sensor.py @@ -1,4 +1,5 @@ """Sensor platform for myenergi.""" + import operator from homeassistant.components.binary_sensor import BinarySensorEntity diff --git a/custom_components/myenergi/config_flow.py b/custom_components/myenergi/config_flow.py index 48986bb..cc69799 100644 --- a/custom_components/myenergi/config_flow.py +++ b/custom_components/myenergi/config_flow.py @@ -1,4 +1,5 @@ """Adds config flow for myenergi.""" + import logging import traceback diff --git a/custom_components/myenergi/const.py b/custom_components/myenergi/const.py index 5195bf4..0b50738 100644 --- a/custom_components/myenergi/const.py +++ b/custom_components/myenergi/const.py @@ -1,4 +1,5 @@ """Constants for myenergi.""" + # Base component constants NAME = "myenergi" DOMAIN = "myenergi" diff --git a/custom_components/myenergi/diagnostics.py b/custom_components/myenergi/diagnostics.py index 3680e00..f581560 100644 --- a/custom_components/myenergi/diagnostics.py +++ b/custom_components/myenergi/diagnostics.py @@ -1,4 +1,5 @@ """Diagnostics support for Daikin Diagnostics.""" + from __future__ import annotations from typing import Any diff --git a/custom_components/myenergi/entity.py b/custom_components/myenergi/entity.py index 62dbd34..74b6047 100644 --- a/custom_components/myenergi/entity.py +++ b/custom_components/myenergi/entity.py @@ -1,4 +1,5 @@ """MyenergiEntity class""" + import logging from homeassistant.helpers.entity import EntityCategory diff --git a/custom_components/myenergi/number.py b/custom_components/myenergi/number.py index a91cff0..53e4a4d 100644 --- a/custom_components/myenergi/number.py +++ b/custom_components/myenergi/number.py @@ -1,4 +1,5 @@ """Sensor platform for myenergi.""" + from homeassistant.components.number import NumberEntity from homeassistant.helpers.entity import EntityCategory diff --git a/custom_components/myenergi/select.py b/custom_components/myenergi/select.py index f6c2065..ec78c52 100644 --- a/custom_components/myenergi/select.py +++ b/custom_components/myenergi/select.py @@ -1,4 +1,5 @@ """Sensor platform for myenergi.""" + import voluptuous as vol from homeassistant.components.select import SelectEntity from homeassistant.helpers import entity_platform diff --git a/custom_components/myenergi/sensor.py b/custom_components/myenergi/sensor.py index 577bdb4..734d4e0 100644 --- a/custom_components/myenergi/sensor.py +++ b/custom_components/myenergi/sensor.py @@ -1,4 +1,5 @@ """Sensor platform for myenergi.""" + import operator from homeassistant.components.sensor import SensorDeviceClass diff --git a/requirements_dev.txt b/requirements_dev.txt index 6a47511..e8ee81e 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,7 +1,6 @@ pre-commit==3.6.2 black==24.2.0 flake8==7.0.0 -reorder-python-imports==3.12.0 homeassistant pymyenergi pytest diff --git a/tests/__init__.py b/tests/__init__.py index 9db9b25..5af5d83 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,4 +1,5 @@ """Tests for myenergi integration.""" + from __future__ import annotations import json diff --git a/tests/conftest.py b/tests/conftest.py index e49740a..cc41a77 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,4 +1,5 @@ """Global fixtures for myenergi integration.""" + from typing import Any from unittest.mock import patch diff --git a/tests/const.py b/tests/const.py index a45d327..e63b0c6 100644 --- a/tests/const.py +++ b/tests/const.py @@ -1,4 +1,5 @@ """Constants for myenergi tests.""" + from custom_components.myenergi.const import ( CONF_PASSWORD, ) diff --git a/tests/test_config_flow.py b/tests/test_config_flow.py index 9dd3df1..e188c47 100644 --- a/tests/test_config_flow.py +++ b/tests/test_config_flow.py @@ -1,4 +1,5 @@ """Test myenergi config flow.""" + from unittest.mock import patch import pytest diff --git a/tests/test_init.py b/tests/test_init.py index f5c79a9..8f49e10 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -1,4 +1,5 @@ """Test myenergi setup process.""" + import pytest from custom_components.myenergi import ( async_reload_entry, diff --git a/tests/test_number.py b/tests/test_number.py index 17afb63..4971c7f 100644 --- a/tests/test_number.py +++ b/tests/test_number.py @@ -1,4 +1,5 @@ """Test myenergi sensor.""" + from unittest.mock import MagicMock from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN diff --git a/tests/test_select.py b/tests/test_select.py index c8b896c..fcf63a9 100644 --- a/tests/test_select.py +++ b/tests/test_select.py @@ -1,4 +1,5 @@ """Test myenergi sensor.""" + from unittest.mock import MagicMock from homeassistant.components.select import DOMAIN as SELECT_DOMAIN diff --git a/tests/test_sensor.py b/tests/test_sensor.py index b71f343..5f42f33 100644 --- a/tests/test_sensor.py +++ b/tests/test_sensor.py @@ -1,4 +1,5 @@ """Test myenergi sensor.""" + from homeassistant.core import HomeAssistant from . import setup_mock_myenergi_config_entry diff --git a/tests/test_services.py b/tests/test_services.py index 3d689b8..29074c1 100644 --- a/tests/test_services.py +++ b/tests/test_services.py @@ -1,4 +1,5 @@ """Test myenergi sensor.""" + from unittest.mock import MagicMock from homeassistant.const import ATTR_ENTITY_ID